Skip to content

8963 Remove edit icons in dashboard row #71

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
merged 1 commit into from
Mar 30, 2023
Merged

8963 Remove edit icons in dashboard row #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 18 additions & 2 deletions public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import classNames from 'classnames';
import React from 'react';
import { Unsubscribable } from 'rxjs';
import {connect} from "react-redux"

import { selectors } from '@grafana/e2e-selectors';
import { getTemplateSrv, RefreshEvent } from '@grafana/runtime';
Expand All @@ -11,13 +12,15 @@ import { ShowConfirmModalEvent } from '../../../../types/events';
import { DashboardModel } from '../../state/DashboardModel';
import { PanelModel } from '../../state/PanelModel';
import { RowOptionsButton } from '../RowOptions/RowOptionsButton';
import { StoreState } from 'app/types';

export interface DashboardRowProps {
panel: PanelModel;
dashboard: DashboardModel;
isFnDashboard: boolean
}

export class DashboardRow extends React.Component<DashboardRowProps> {
class Component extends React.Component<DashboardRowProps> {
sub?: Unsubscribable;

componentDidMount() {
Expand Down Expand Up @@ -69,10 +72,13 @@ export class DashboardRow extends React.Component<DashboardRowProps> {
'dashboard-row--collapsed': this.props.panel.collapsed,
});

const {isFnDashboard} = this.props

const title = getTemplateSrv().replace(this.props.panel.title, this.props.panel.scopedVars, 'text');
const count = this.props.panel.panels ? this.props.panel.panels.length : 0;
const panels = count === 1 ? 'panel' : 'panels';
const canEdit = this.props.dashboard.meta.canEdit === true;
const canEdit = this.props.dashboard.meta.canEdit === true && !isFnDashboard;


return (
<div className={classes} data-testid="dashboard-row-container">
Expand Down Expand Up @@ -110,3 +116,13 @@ export class DashboardRow extends React.Component<DashboardRowProps> {
);
}
}


function mapStateToProps () {
return (state: StoreState) => ({
isFnDashboard: state.fnGlobalState.FNDashboard
});
}


export const DashboardRow = connect(mapStateToProps)(Component);