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

fixing imports, minor fix on mapping row

Browse Source
This commit is contained in:
Peter Holmberg 2019-01-15 17:33:42 +00:00
parent 58094faa12
commit 83fbf52aac
6 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grafana-ui/src/components/FormGroup/FormGroup.tsx
View File

@ -1,7 +1,7 @@
import React, { SFC } from 'react'; import React, { SFC } from 'react';
import { Label } from '..'; import { Label } from '..';
interface Props { export interface Props {
label: string; label: string;
inputProps: {}; inputProps: {};
labelWidth?: number; labelWidth?: number;

2
packages/grafana-ui/src/components/Label/Label.tsx
View File

@ -1,5 +1,5 @@
import React, { SFC, ReactNode } from 'react'; import React, { SFC, ReactNode } from 'react';
import { Tooltip } from '@grafana/ui'; import { Tooltip } from '..';
interface Props { interface Props {
tooltip?: string; tooltip?: string;

3
public/app/core/components/SharedPreferences/SharedPreferences.tsx
View File

@ -1,7 +1,6 @@
import React, { PureComponent } from 'react'; import React, { PureComponent } from 'react';
import { Label } from '../../../../../packages/grafana-ui/src/components/Label/Label'; import { Label, Select } from '@grafana/ui';
import { Select } from '@grafana/ui';
import { getBackendSrv, BackendSrv } from 'app/core/services/backend_srv'; import { getBackendSrv, BackendSrv } from 'app/core/services/backend_srv';
import { DashboardSearchHit } from 'app/types'; import { DashboardSearchHit } from 'app/types';

2
public/app/features/datasources/settings/BasicSettings.tsx
View File

@ -1,5 +1,5 @@
import React, { SFC } from 'react'; import React, { SFC } from 'react';
import { Label } from '../../../../../packages/grafana-ui/src/components/Label/Label'; import { Label } from '@grafana/ui';
import { Switch } from '../../../core/components/Switch/Switch'; import { Switch } from '../../../core/components/Switch/Switch';
export interface Props { export interface Props {

2
public/app/features/teams/TeamSettings.tsx
View File

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { Label } from '../../../../packages/grafana-ui/src/components/Label/Label'; import { Label } from '@grafana/ui';
import { SharedPreferences } from 'app/core/components/SharedPreferences/SharedPreferences'; import { SharedPreferences } from 'app/core/components/SharedPreferences/SharedPreferences';
import { updateTeam } from './state/actions'; import { updateTeam } from './state/actions';
import { getRouteParamsId } from 'app/core/selectors/location'; import { getRouteParamsId } from 'app/core/selectors/location';

19
public/app/plugins/panel/gauge/MappingRow.tsx
View File

@ -81,16 +81,15 @@ export default class MappingRow extends PureComponent<Props, State> {
}} }}
inputWidth={8} inputWidth={8}
/> />
<FormGroup <div className="gf-form gf-form--grow">
label="Text" <Label width={4}>Text</Label>
labelWidth={4} <input
inputProps={{ className="gf-form-input"
onBlur: () => this.updateMapping, onBlur={this.updateMapping}
onChange: event => this.onMappingTextChange(event), value={text}
value: text, onChange={this.onMappingTextChange}
}} />
inputWidth={10} </div>
/>
</> </>
); );
} }