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

wip: minor update

Browse Source
This commit is contained in:
Torkel Ödegaard 2018-11-15 07:33:59 +01:00
parent 159c5cdb63
commit 487fd12d66
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/features/dashboard/dashgrid/EditorTabBody.tsx
View File

@ -4,7 +4,7 @@ import { FadeIn } from 'app/core/components/Animations/FadeIn';
interface Props { interface Props {
children: JSX.Element; children: JSX.Element;
main: EditorToolBarView; main?: EditorToolBarView;
toolbarItems: EditorToolBarView[]; toolbarItems: EditorToolBarView[];
} }
@ -75,11 +75,13 @@ export class EditorTabBody extends PureComponent<Props, State> {
return ( return (
<> <>
<div className="toolbar"> {main && (
{this.renderMainSelection(main)} <div className="toolbar">
<div className="gf-form--grow" /> {this.renderMainSelection(main)}
{toolbarItems.map(item => this.renderButton(item))} <div className="gf-form--grow" />
</div> {toolbarItems.map(item => this.renderButton(item))}
</div>
)}
<div className="panel-editor__scroll"> <div className="panel-editor__scroll">
<CustomScrollbar autoHide={false}> <CustomScrollbar autoHide={false}>
<div className="panel-editor__content"> <div className="panel-editor__content">

5
public/app/features/dashboard/dashgrid/GeneralTab.tsx
View File

@ -4,11 +4,9 @@ import { getAngularLoader, AngularComponent } from 'app/core/services/AngularLoa
import { EditorTabBody } from './EditorTabBody'; import { EditorTabBody } from './EditorTabBody';
import { PanelModel } from '../panel_model'; import { PanelModel } from '../panel_model';
import { DashboardModel } from '../dashboard_model';
interface Props { interface Props {
panel: PanelModel; panel: PanelModel;
dashboard: DashboardModel;
} }
export class GeneralTab extends PureComponent<Props> { export class GeneralTab extends PureComponent<Props> {
@ -24,14 +22,13 @@ export class GeneralTab extends PureComponent<Props> {
return; return;
} }
const { panel, dashboard } = this.props; const { panel } = this.props;
const loader = getAngularLoader(); const loader = getAngularLoader();
const template = '<panel-general-tab />'; const template = '<panel-general-tab />';
const scopeProps = { const scopeProps = {
ctrl: { ctrl: {
panel: panel, panel: panel,
dashboard: dashboard,
}, },
}; };

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

@ -82,7 +82,7 @@ export class PanelEditor extends PureComponent<PanelEditorProps> {
</button> </button>
</div> </div>
{activeTab === 'general' && <GeneralTab panel={panel} dashboard={dashboard} />} {activeTab === 'general' && <GeneralTab panel={panel} />}
{activeTab === 'queries' && <QueriesTab panel={panel} dashboard={dashboard} />} {activeTab === 'queries' && <QueriesTab panel={panel} dashboard={dashboard} />}
{activeTab === 'visualization' && ( {activeTab === 'visualization' && (
<VisualizationTab panel={panel} dashboard={dashboard} plugin={plugin} onTypeChanged={onTypeChanged} /> <VisualizationTab panel={panel} dashboard={dashboard} plugin={plugin} onTypeChanged={onTypeChanged} />

1
public/app/features/panel/GeneralTabCtrl.ts
View File

@ -1,5 +1,4 @@
import coreModule from 'app/core/core_module'; import coreModule from 'app/core/core_module';
import { DashboardModel } from '../dashboard/dashboard_model';
export class GeneralTabCtrl { export class GeneralTabCtrl {
panelCtrl: any; panelCtrl: any;