Explore: Make Drilldowns box dismissible (#101193)
This commit is contained in:
@@ -0,0 +1,42 @@
|
||||
import { useLocalStorage } from 'react-use';
|
||||
|
||||
import { Alert, LinkButton, Stack } from '@grafana/ui';
|
||||
|
||||
import { t, Trans } from '../../core/internationalization';
|
||||
|
||||
type Props = {
|
||||
datasourceType: string;
|
||||
};
|
||||
|
||||
export function DrilldownAlertBox(props: Props) {
|
||||
const isDsCompatibleWithDrilldown = ['prometheus', 'loki', 'tempo', 'grafana-pyroscope-datasource'].includes(
|
||||
props.datasourceType
|
||||
);
|
||||
|
||||
const [dismissed, setDismissed] = useLocalStorage('grafana.explore.drilldownsBoxDismissed', false);
|
||||
|
||||
return (
|
||||
isDsCompatibleWithDrilldown &&
|
||||
!dismissed && (
|
||||
<Alert
|
||||
severity={'info'}
|
||||
title={t('explore.drilldownInfo.title', 'Explore Metrics, Logs, Traces and Profiles have moved!')}
|
||||
onRemove={() => {
|
||||
setDismissed(true);
|
||||
}}
|
||||
>
|
||||
<Stack gap={1} alignItems="flex-end" justifyContent={'space-between'}>
|
||||
<span>
|
||||
<Trans i18nKey={'explore.drilldownInfo.description'}>
|
||||
Looking for the Grafana Explore apps? They are now called the Grafana Drilldown apps and can be found
|
||||
under <b>Menu > Drilldown</b>
|
||||
</Trans>
|
||||
</span>
|
||||
<LinkButton variant={'secondary'} href="/drilldown">
|
||||
<Trans i18nKey={'explore.drilldownInfo.action'}>Go to Grafana Drilldown</Trans>
|
||||
</LinkButton>
|
||||
</Stack>
|
||||
</Alert>
|
||||
)
|
||||
);
|
||||
}
|
||||
@@ -23,18 +23,14 @@ import { getDataSourceSrv, reportInteraction } from '@grafana/runtime';
|
||||
import { DataQuery } from '@grafana/schema';
|
||||
import {
|
||||
AdHocFilterItem,
|
||||
Alert,
|
||||
ErrorBoundaryAlert,
|
||||
LinkButton,
|
||||
PanelContainer,
|
||||
ScrollContainer,
|
||||
Stack,
|
||||
Themeable2,
|
||||
withTheme2,
|
||||
} from '@grafana/ui';
|
||||
import { FILTER_FOR_OPERATOR, FILTER_OUT_OPERATOR } from '@grafana/ui/src/components/Table/types';
|
||||
import { supportedFeatures } from 'app/core/history/richHistoryStorageProvider';
|
||||
import { t, Trans } from 'app/core/internationalization';
|
||||
import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource';
|
||||
import { StoreState } from 'app/types';
|
||||
|
||||
@@ -45,6 +41,7 @@ import { ContentOutlineContextProvider } from './ContentOutline/ContentOutlineCo
|
||||
import { ContentOutlineItem } from './ContentOutline/ContentOutlineItem';
|
||||
import { CorrelationHelper } from './CorrelationHelper';
|
||||
import { CustomContainer } from './CustomContainer';
|
||||
import { DrilldownAlertBox } from './DrilldownAlertBox';
|
||||
import { ExploreToolbar } from './ExploreToolbar';
|
||||
import { FlameGraphExploreContainer } from './FlameGraph/FlameGraphExploreContainer';
|
||||
import { GraphContainer } from './Graph/GraphContainer';
|
||||
@@ -568,9 +565,6 @@ export class Explore extends PureComponent<Props, ExploreState> {
|
||||
if (showCorrelationHelper && correlationEditorHelperData !== undefined) {
|
||||
correlationsBox = <CorrelationHelper exploreId={exploreId} correlations={correlationEditorHelperData} />;
|
||||
}
|
||||
const isDsCompatibleWithDrilldown = ['prometheus', 'loki', 'tempo', 'grafana-pyroscope-datasource'].includes(
|
||||
datasourceInstance?.type || ''
|
||||
);
|
||||
|
||||
return (
|
||||
<ContentOutlineContextProvider refreshDependencies={this.props.queries}>
|
||||
@@ -600,27 +594,7 @@ export class Explore extends PureComponent<Props, ExploreState> {
|
||||
<>
|
||||
<ContentOutlineItem panelId="Queries" title="Queries" icon="arrow" mergeSingleChild={true}>
|
||||
<PanelContainer className={styles.queryContainer}>
|
||||
{isDsCompatibleWithDrilldown && (
|
||||
<Alert
|
||||
severity={'info'}
|
||||
title={t(
|
||||
'explore.drilldownInfo.title',
|
||||
'Explore Metrics, Logs, Traces and Profiles have moved!'
|
||||
)}
|
||||
>
|
||||
<Stack gap={1} alignItems="flex-end" justifyContent={'space-between'}>
|
||||
<span>
|
||||
<Trans i18nKey={'explore.drilldownInfo.description'}>
|
||||
Looking for the Grafana Explore apps? They are now called the Grafana Drilldown apps
|
||||
and can be found under <b>Menu > Drilldown</b>
|
||||
</Trans>
|
||||
</span>
|
||||
<LinkButton variant={'secondary'} href="/drilldown">
|
||||
<Trans i18nKey={'explore.drilldownInfo.action'}>Go to Grafana Drilldown</Trans>
|
||||
</LinkButton>
|
||||
</Stack>
|
||||
</Alert>
|
||||
)}
|
||||
<DrilldownAlertBox datasourceType={datasourceInstance?.type || ''} />
|
||||
{correlationsBox}
|
||||
<QueryRows exploreId={exploreId} />
|
||||
<SecondaryActions
|
||||
|
||||
Reference in New Issue
Block a user