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

Use URL isFirstPanel to enable panel editor onboarding (#67546)

Browse Source
This commit is contained in:
Ivan Ortega Alba 2023-04-28 19:09:44 +02:00 committed by GitHub
parent 7bceab4ad4
commit cdf8555ace
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/dashboard/dashgrid/DashboardEmpty.tsx
View File

@ -43,7 +43,7 @@ export const DashboardEmpty = ({ dashboard, canCreate }: Props) => {
onClick={() => {
const id = onCreateNewPanel(dashboard, initialDatasource);
reportInteraction('dashboards_emptydashboard_clicked', { item: 'add_visualization' });
locationService.partial({ editPanel: id });
locationService.partial({ editPanel: id, firstPanel: true });
dispatch(setInitialDatasource(undefined));
}}
disabled={!canCreate}

14
public/app/features/query/components/QueryGroup.tsx
View File

@ -124,9 +124,7 @@ export class QueryGroup extends PureComponent<Props, State> {
defaultDataSource,
// TODO: Detect the first panel added into a new dashboard better.
// This is flaky in case the UID is generated differently
isDataSourceModalOpen:
locationService.getLocation().pathname === '/dashboard/new' &&
locationService.getSearchObject().editPanel === '1',
isDataSourceModalOpen: !!locationService.getSearchObject().firstPanel,
});
} catch (error) {
console.log('failed to load data source', error);
@ -261,6 +259,11 @@ export class QueryGroup extends PureComponent<Props, State> {
this.setState({ isHelpOpen: false });
};
onCloseDataSourceModal = () => {
this.setState({ isDataSourceModalOpen: false });
locationService.partial({ firstPanel: null });
};
renderMixedPicker = () => {
return (
<DataSourcePicker
@ -289,15 +292,14 @@ export class QueryGroup extends PureComponent<Props, State> {
current: this.props.options.dataSource,
onChange: (ds: DataSourceInstanceSettings) => {
this.onChangeDataSource(ds);
this.setState({ isDataSourceModalOpen: false });
this.onCloseDataSourceModal();
},
};
const onDismiss = () => this.setState({ isDataSourceModalOpen: false });
return (
<>
{isDataSourceModalOpen && config.featureToggles.advancedDataSourcePicker && (
<DataSourceModal {...commonProps} onDismiss={onDismiss}></DataSourceModal>
<DataSourceModal {...commonProps} onDismiss={this.onCloseDataSourceModal}></DataSourceModal>
)}
<DataSourcePicker
{...commonProps}