mirror of https://github.com/grafana/grafana
Remove return to panel button and related code (#45018)
Kristina
3 years ago
committed by
GitHub
parent
834d11691f
commit
4e38ac9cf7
@ -1,46 +0,0 @@ |
||||
import React, { ComponentProps } from 'react'; |
||||
import { render, screen } from '@testing-library/react'; |
||||
import { UnconnectedReturnToDashboardButton as ReturnToDashboardButton } from './ReturnToDashboardButton'; |
||||
import { ExploreId } from 'app/types/explore'; |
||||
|
||||
const createProps = (propsOverride?: Partial<ComponentProps<typeof ReturnToDashboardButton>>) => { |
||||
const defaultProps = { |
||||
originPanelId: 1, |
||||
splitted: false, |
||||
canEdit: true, |
||||
exploreId: ExploreId.left, |
||||
queries: [], |
||||
setDashboardQueriesToUpdateOnLoad: jest.fn(), |
||||
}; |
||||
|
||||
return Object.assign(defaultProps, propsOverride) as ComponentProps<typeof ReturnToDashboardButton>; |
||||
}; |
||||
|
||||
describe('ReturnToDashboardButton', () => { |
||||
it('should render 2 buttons if originPanelId is provided', () => { |
||||
render(<ReturnToDashboardButton {...createProps()} />); |
||||
expect(screen.getAllByTestId(/returnButton/i)).toHaveLength(2); |
||||
}); |
||||
|
||||
it('should not render any button if originPanelId is not provided', () => { |
||||
render(<ReturnToDashboardButton {...createProps({ originPanelId: undefined })} />); |
||||
expect(screen.queryByTestId(/returnButton/i)).toBeNull(); |
||||
}); |
||||
|
||||
it('should not render any button if split view', () => { |
||||
render(<ReturnToDashboardButton {...createProps({ splitted: true })} />); |
||||
expect(screen.queryByTestId(/returnButton/i)).toBeNull(); |
||||
}); |
||||
|
||||
it('should not render return to panel with changes button if user cannot edit panel', () => { |
||||
render(<ReturnToDashboardButton {...createProps({ canEdit: false })} />); |
||||
expect(screen.getAllByTestId(/returnButton/i)).toHaveLength(1); |
||||
}); |
||||
|
||||
it('should show option to return to dashboard with changes', () => { |
||||
render(<ReturnToDashboardButton {...createProps()} />); |
||||
const returnWithChangesButton = screen.getByTestId('returnButtonWithChanges'); |
||||
returnWithChangesButton.click(); |
||||
expect(screen.getAllByText('Return to panel with changes')).toHaveLength(1); |
||||
}); |
||||
}); |
||||
@ -1,110 +0,0 @@ |
||||
import React, { FC } from 'react'; |
||||
import { connect, ConnectedProps } from 'react-redux'; |
||||
import { ButtonGroup, ButtonSelect, Icon, ToolbarButton, Tooltip } from '@grafana/ui'; |
||||
import { DataQuery, urlUtil } from '@grafana/data'; |
||||
|
||||
import kbn from '../../core/utils/kbn'; |
||||
import config from 'app/core/config'; |
||||
import { getDashboardSrv } from '../dashboard/services/DashboardSrv'; |
||||
import { StoreState } from 'app/types'; |
||||
import { ExploreId } from 'app/types/explore'; |
||||
import { setDashboardQueriesToUpdateOnLoad } from '../dashboard/state/reducers'; |
||||
import { isSplit } from './state/selectors'; |
||||
import { locationService } from '@grafana/runtime'; |
||||
import { contextSrv } from 'app/core/services/context_srv'; |
||||
|
||||
function mapStateToProps(state: StoreState, { exploreId }: { exploreId: ExploreId }) { |
||||
const explore = state.explore; |
||||
const splitted = isSplit(state); |
||||
const { datasourceInstance, queries, originPanelId } = explore[exploreId]!; |
||||
|
||||
const roles = ['Editor', 'Admin']; |
||||
if (config.viewersCanEdit) { |
||||
roles.push('Viewer'); |
||||
} |
||||
|
||||
return { |
||||
exploreId, |
||||
datasourceInstance, |
||||
queries, |
||||
originPanelId, |
||||
splitted, |
||||
canEdit: roles.some((r) => contextSrv.hasRole(r)), |
||||
}; |
||||
} |
||||
|
||||
const mapDispatchToProps = { |
||||
setDashboardQueriesToUpdateOnLoad, |
||||
}; |
||||
|
||||
const connector = connect(mapStateToProps, mapDispatchToProps); |
||||
type Props = ConnectedProps<typeof connector>; |
||||
|
||||
export const UnconnectedReturnToDashboardButton: FC<Props> = ({ |
||||
originPanelId, |
||||
setDashboardQueriesToUpdateOnLoad, |
||||
queries, |
||||
splitted, |
||||
canEdit, |
||||
}) => { |
||||
const withOriginId = originPanelId && Number.isInteger(originPanelId); |
||||
|
||||
// If in split mode, or no origin id, escape early and return null
|
||||
if (splitted || !withOriginId) { |
||||
return null; |
||||
} |
||||
|
||||
const cleanQueries = (queries: DataQuery[]) => { |
||||
return queries.map((query: DataQuery & { context?: string }) => { |
||||
delete query.context; |
||||
delete query.key; |
||||
return query; |
||||
}); |
||||
}; |
||||
|
||||
const returnToPanel = async ({ withChanges = false } = {}) => { |
||||
const dashboardSrv = getDashboardSrv(); |
||||
const dash = dashboardSrv.getCurrent(); |
||||
if (!dash) { |
||||
return; |
||||
} |
||||
|
||||
const titleSlug = kbn.slugifyForUrl(dash.title); |
||||
|
||||
if (withChanges) { |
||||
setDashboardQueriesToUpdateOnLoad({ |
||||
panelId: originPanelId!, |
||||
queries: cleanQueries(queries), |
||||
}); |
||||
} |
||||
|
||||
const query: any = {}; |
||||
|
||||
if (withChanges || dash.panelInEdit) { |
||||
query.editPanel = originPanelId; |
||||
} else if (dash.panelInView) { |
||||
query.viewPanel = originPanelId; |
||||
} |
||||
|
||||
locationService.push(urlUtil.renderUrl(`/d/${dash.uid}/:${titleSlug}`, query)); |
||||
}; |
||||
|
||||
return ( |
||||
<ButtonGroup> |
||||
<Tooltip content={'Return to panel'} placement="bottom"> |
||||
<ToolbarButton data-testid="returnButton" title={'Return to panel'} onClick={() => returnToPanel()}> |
||||
<Icon name="arrow-left" /> |
||||
</ToolbarButton> |
||||
</Tooltip> |
||||
{canEdit && ( |
||||
<ButtonSelect |
||||
data-testid="returnButtonWithChanges" |
||||
options={[{ label: 'Return to panel with changes', value: '' }]} |
||||
onChange={() => returnToPanel({ withChanges: true })} |
||||
/> |
||||
)} |
||||
</ButtonGroup> |
||||
); |
||||
}; |
||||
|
||||
export default connector(UnconnectedReturnToDashboardButton); |
||||
Loading…
Reference in new issue