IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replace AppEvents with notifyApp in Explore (#31864)

Browse Source 
* Replace AppEvents with notifyApp in Explore

* Replace AppEvents with notifyApp in Explore-related components
This commit is contained in:
Piotr Jamróz 2021-03-15 15:11:52 +01:00 committed by GitHub
parent 3507c1d188
commit f97384c2f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 50 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/core/utils/richHistory.ts
View File

@ -2,9 +2,11 @@
import _ from 'lodash';
// Services & Utils
import { DataQuery, DataSourceApi, dateTimeFormat, AppEvents, urlUtil, ExploreUrlState } from '@grafana/data';
import appEvents from 'app/core/app_events';
import { DataQuery, DataSourceApi, dateTimeFormat, urlUtil, ExploreUrlState } from '@grafana/data';
import store from 'app/core/store';
import { dispatch } from 'app/store/store';
import { notifyApp } from 'app/core/actions';
import { createErrorNotification } from 'app/core/copy/appNotification';
// Types
import { RichHistoryQuery } from 'app/types/explore';
@ -76,7 +78,7 @@ export function addToRichHistory(
store.setObject(RICH_HISTORY_KEY, updatedHistory);
return updatedHistory;
} catch (error) {
appEvents.emit(AppEvents.alertError, [error]);
dispatch(notifyApp(createErrorNotification(error)));
return richHistory;
}
}
@ -109,7 +111,7 @@ export function updateStarredInRichHistory(richHistory: RichHistoryQuery[], ts:
store.setObject(RICH_HISTORY_KEY, updatedHistory);
return updatedHistory;
} catch (error) {
appEvents.emit(AppEvents.alertError, [error]);
dispatch(notifyApp(createErrorNotification(error)));
return richHistory;
}
}
@ -131,7 +133,7 @@ export function updateCommentInRichHistory(
store.setObject(RICH_HISTORY_KEY, updatedHistory);
return updatedHistory;
} catch (error) {
appEvents.emit(AppEvents.alertError, [error]);
dispatch(notifyApp(createErrorNotification(error)));
return richHistory;
}
}
@ -142,7 +144,7 @@ export function deleteQueryInRichHistory(richHistory: RichHistoryQuery[], ts: nu
store.setObject(RICH_HISTORY_KEY, updatedHistory);
return updatedHistory;
} catch (error) {
appEvents.emit(AppEvents.alertError, [error]);
dispatch(notifyApp(createErrorNotification(error)));
return richHistory;
}
}

11
public/app/core/utils/shortLinks.ts
View File

@ -1,8 +1,9 @@
import memoizeOne from 'memoize-one';
import { getBackendSrv, config } from '@grafana/runtime';
import { AppEvents } from '@grafana/data';
import appEvents from 'app/core/app_events';
import { copyStringToClipboard } from './explore';
import { dispatch } from 'app/store/store';
import { notifyApp } from 'app/core/actions';
import { createErrorNotification, createSuccessNotification } from 'app/core/copy/appNotification';
function buildHostUrl() {
return `${window.location.protocol}//${window.location.host}${config.appSubUrl}`;
@ -21,7 +22,7 @@ export const createShortLink = memoizeOne(async function (path: string) {
return shortLink.url;
} catch (err) {
console.error('Error when creating shortened link: ', err);
appEvents.emit(AppEvents.alertError, ['Error generating shortened link']);
dispatch(notifyApp(createErrorNotification('Error generating shortened link')));
}
});
@ -29,8 +30,8 @@ export const createAndCopyShortLink = async (path: string) => {
const shortLink = await createShortLink(path);
if (shortLink) {
copyStringToClipboard(shortLink);
appEvents.emit(AppEvents.alertSuccess, ['Shortened link copied to clipboard']);
dispatch(notifyApp(createSuccessNotification('Shortened link copied to clipboard')));
} else {
appEvents.emit(AppEvents.alertError, ['Error generating shortened link']);
dispatch(notifyApp(createErrorNotification('Error generating shortened link')));
}
};

8
public/app/features/explore/ExploreQueryInspector.tsx
View File

@ -1,8 +1,7 @@
import React, { useState } from 'react';
import { Button, JSONFormatter, LoadingPlaceholder, TabbedContainer, TabConfig } from '@grafana/ui';
import { AppEvents, PanelData, TimeZone } from '@grafana/data';
import { PanelData, TimeZone } from '@grafana/data';
import appEvents from 'app/core/app_events';
import { CopyToClipboard } from 'app/core/components/CopyToClipboard/CopyToClipboard';
import { StoreState, ExploreItemState, ExploreId } from 'app/types';
import { hot } from 'react-hot-loader';
@ -12,6 +11,9 @@ import { useEffectOnce } from 'react-use';
import { getBackendSrv } from 'app/core/services/backend_srv';
import { InspectStatsTab } from '../dashboard/components/Inspector/InspectStatsTab';
import { getPanelInspectorStyles } from '../dashboard/components/Inspector/styles';
import { dispatch } from 'app/store/store';
import { notifyApp } from 'app/core/actions';
import { createSuccessNotification } from 'app/core/copy/appNotification';
function stripPropsFromResponse(response: any) {
// ignore silent requests and return early
@ -73,7 +75,7 @@ export function ExploreQueryInspector(props: Props) {
};
const onClipboardSuccess = () => {
appEvents.emit(AppEvents.alertSuccess, ['Content copied to clipboard']);
dispatch(notifyApp(createSuccessNotification('Content copied to clipboard')));
};
const [allNodesExpanded, setAllNodesExpanded] = useState(false);

11
public/app/features/explore/RichHistory/RichHistoryCard.tsx
View File

@ -4,12 +4,15 @@ import { hot } from 'react-hot-loader';
import { css, cx } from 'emotion';
import { stylesFactory, useTheme, TextArea, Button, IconButton } from '@grafana/ui';
import { getDataSourceSrv } from '@grafana/runtime';
import { GrafanaTheme, AppEvents, DataSourceApi } from '@grafana/data';
import { GrafanaTheme, DataSourceApi } from '@grafana/data';
import { RichHistoryQuery, ExploreId } from 'app/types/explore';
import { createUrlFromRichHistory, createQueryText } from 'app/core/utils/richHistory';
import { createAndCopyShortLink } from 'app/core/utils/shortLinks';
import { copyStringToClipboard } from 'app/core/utils/explore';
import appEvents from 'app/core/app_events';
import { dispatch } from 'app/store/store';
import { notifyApp } from 'app/core/actions';
import { createSuccessNotification } from 'app/core/copy/appNotification';
import { StoreState } from 'app/types';
import { updateRichHistory } from '../state/history';
@ -179,7 +182,7 @@ export function RichHistoryCard(props: Props) {
const onCopyQuery = () => {
const queriesToCopy = query.queries.map((q) => createQueryText(q, queryDsInstance)).join('\n');
copyStringToClipboard(queriesToCopy);
appEvents.emit(AppEvents.alertSuccess, ['Query copied to clipboard']);
dispatch(notifyApp(createSuccessNotification('Query copied to clipboard')));
};
const onCreateShortLink = async () => {
@ -198,13 +201,13 @@ export function RichHistoryCard(props: Props) {
icon: 'trash-alt',
onConfirm: () => {
updateRichHistory(query.ts, 'delete');
appEvents.emit(AppEvents.alertSuccess, ['Query deleted']);
dispatch(notifyApp(createSuccessNotification('Query deleted')));
},
})
);
} else {
updateRichHistory(query.ts, 'delete');
appEvents.emit(AppEvents.alertSuccess, ['Query deleted']);
dispatch(notifyApp(createSuccessNotification('Query deleted')));
}
};

7
public/app/features/explore/RichHistory/RichHistorySettings.tsx
View File

@ -1,9 +1,12 @@
import React from 'react';
import { css } from 'emotion';
import { stylesFactory, useTheme, Select, Button, Switch, Field } from '@grafana/ui';
import { GrafanaTheme, AppEvents } from '@grafana/data';
import { GrafanaTheme } from '@grafana/data';
import appEvents from 'app/core/app_events';
import { ShowConfirmModalEvent } from '../../../types/events';
import { dispatch } from 'app/store/store';
import { notifyApp } from 'app/core/actions';
import { createSuccessNotification } from 'app/core/copy/appNotification';
export interface RichHistorySettingsProps {
retentionPeriod: number;
@ -67,7 +70,7 @@ export function RichHistorySettings(props: RichHistorySettingsProps) {
icon: 'trash-alt',
onConfirm: () => {
deleteRichHistory();
appEvents.emit(AppEvents.alertSuccess, ['Query history deleted']);
dispatch(notifyApp(createSuccessNotification('Query history deleted')));
},
})
);

8
public/app/plugins/datasource/cloudwatch/components/LogsQueryField.tsx
View File

@ -21,14 +21,16 @@ import { Editor, Node, Plugin } from 'slate';
import syntax from '../syntax';
// Types
import { AbsoluteTimeRange, AppEvents, ExploreQueryFieldProps, SelectableValue } from '@grafana/data';
import { AbsoluteTimeRange, ExploreQueryFieldProps, SelectableValue } from '@grafana/data';
import { CloudWatchJsonData, CloudWatchLogsQuery, CloudWatchQuery } from '../types';
import { CloudWatchDatasource } from '../datasource';
import { LanguageMap, languages as prismLanguages } from 'prismjs';
import { CloudWatchLanguageProvider } from '../language_provider';
import { css } from 'emotion';
import { ExploreId } from 'app/types';
import { appEvents } from 'app/core/core';
import { dispatch } from 'app/store/store';
import { notifyApp } from 'app/core/actions';
import { createErrorNotification } from 'app/core/copy/appNotification';
import { InputActionMeta } from '@grafana/ui/src/components/Select/types';
import { getStatsGroups } from '../utils/query/getStatsGroups';
@ -119,7 +121,7 @@ export class CloudWatchLogsQueryField extends React.PureComponent<CloudWatchLogs
label: logGroup,
}));
} catch (err) {
appEvents.emit(AppEvents.alertError, [err]);
dispatch(notifyApp(createErrorNotification(err)));
return [];
}
};

12
public/app/plugins/datasource/jaeger/QueryField.tsx
View File

@ -1,10 +1,12 @@
import { AppEvents, ExploreQueryFieldProps } from '@grafana/data';
import { ExploreQueryFieldProps } from '@grafana/data';
import { selectors } from '@grafana/e2e-selectors';
import { ButtonCascader, CascaderOption } from '@grafana/ui';
import React from 'react';
import { appEvents } from '../../../core/core';
import { JaegerDatasource, JaegerQuery } from './datasource';
import { Span, TraceResponse } from './types';
import { dispatch } from 'app/store/store';
import { notifyApp } from 'app/core/actions';
import { createErrorNotification } from 'app/core/copy/appNotification';
const ALL_OPERATIONS_KEY = '__ALL__';
const NO_TRACES_KEY = '__NO_TRACES__';
@ -64,7 +66,7 @@ export class JaegerQueryField extends React.PureComponent<Props, State> {
this.setState({ serviceOptions });
}
} catch (error) {
appEvents.emit(AppEvents.alertError, ['Failed to load services from Jaeger', error]);
dispatch(notifyApp(createErrorNotification('Failed to load services from Jaeger', error)));
}
}
@ -153,7 +155,7 @@ export class JaegerQueryField extends React.PureComponent<Props, State> {
try {
return await datasource.metadataRequest(url);
} catch (error) {
appEvents.emit(AppEvents.alertError, ['Failed to load operations from Jaeger', error]);
dispatch(notifyApp(createErrorNotification('Failed to load operations from Jaeger', error)));
}
return [];
};
@ -176,7 +178,7 @@ export class JaegerQueryField extends React.PureComponent<Props, State> {
try {
return await datasource.metadataRequest(url, traceSearch);
} catch (error) {
appEvents.emit(AppEvents.alertError, ['Failed to load traces from Jaeger', error]);
dispatch(notifyApp(createErrorNotification('Failed to load traces from Jaeger', error)));
}
return [];
};

12
public/app/plugins/datasource/zipkin/QueryField.tsx
View File

@ -1,14 +1,16 @@
import { AppEvents, ExploreQueryFieldProps } from '@grafana/data';
import { ExploreQueryFieldProps } from '@grafana/data';
import { selectors } from '@grafana/e2e-selectors';
import { ButtonCascader, CascaderOption } from '@grafana/ui';
import { fromPairs } from 'lodash';
import React, { useCallback, useMemo, useState } from 'react';
import { useAsyncFn, useMount, useMountedState } from 'react-use';
import { AsyncState } from 'react-use/lib/useAsyncFn';
import { appEvents } from '../../../core/core';
import { apiPrefix } from './constants';
import { ZipkinDatasource, ZipkinQuery } from './datasource';
import { ZipkinSpan } from './types';
import { dispatch } from 'app/store/store';
import { notifyApp } from 'app/core/actions';
import { createErrorNotification } from 'app/core/copy/appNotification';
type Props = ExploreQueryFieldProps<ZipkinDatasource, ZipkinQuery>;
@ -74,7 +76,7 @@ export function useServices(datasource: ZipkinDatasource): AsyncState<CascaderOp
}
return [];
} catch (error) {
appEvents.emit(AppEvents.alertError, ['Failed to load services from Zipkin', error]);
dispatch(notifyApp(createErrorNotification('Failed to load services from Zipkin', error)));
throw error;
}
}, [datasource]);
@ -118,7 +120,7 @@ export function useLoadOptions(datasource: ZipkinDatasource) {
});
}
} catch (error) {
appEvents.emit(AppEvents.alertError, ['Failed to load spans from Zipkin', error]);
dispatch(notifyApp(createErrorNotification('Failed to load spans from Zipkin', error)));
throw error;
}
},
@ -159,7 +161,7 @@ export function useLoadOptions(datasource: ZipkinDatasource) {
});
}
} catch (error) {
appEvents.emit(AppEvents.alertError, ['Failed to load spans from Zipkin', error]);
dispatch(notifyApp(createErrorNotification('Failed to load spans from Zipkin', error)));
throw error;
}
},