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

NewPanelEdit: Fixed missing react keys in list error

Browse Source
This commit is contained in:
Torkel Ödegaard 2020-04-05 15:21:53 +02:00
parent 3ec88a013f
commit 09bcdc1020
4 changed files with 49 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/app/features/dashboard/components/PanelEditor/OptionsPaneContent.tsx
View File

@ -184,11 +184,14 @@ export const TabsBarContent: React.FC<{
</div> </div>
) : ( ) : (
<> <>
{tabSelections.map(item => { {tabSelections.map(item => (
return ( <Tab
<Tab label={item.label} active={activeTab === item.value} onChangeTab={() => setActiveTab(item.value)} /> key={item.value}
); label={item.label}
})} active={activeTab === item.value}
onChangeTab={() => setActiveTab(item.value)}
/>
))}
<div className="flex-grow-1" /> <div className="flex-grow-1" />
</> </>
)} )}
@ -219,7 +222,7 @@ const tabSelections: Array<SelectableValue<string>> = [
value: 'options', value: 'options',
}, },
{ {
label: 'Data', label: 'Fields',
value: 'defaults', value: 'defaults',
}, },
{ {

5
public/app/features/dashboard/components/PanelEditor/PanelOptionsTab.tsx
View File

@ -96,7 +96,6 @@ export const PanelOptionsTab: FC<Props> = ({
} }
elements.push( elements.push(
<>
<OptionsGroup title="Panel links" key="panel links" defaultToClosed={true}> <OptionsGroup title="Panel links" key="panel links" defaultToClosed={true}>
<DataLinksInlineEditor <DataLinksInlineEditor
links={panel.links} links={panel.links}
@ -105,6 +104,9 @@ export const PanelOptionsTab: FC<Props> = ({
data={[]} data={[]}
/> />
</OptionsGroup> </OptionsGroup>
);
elements.push(
<OptionsGroup title="Panel repeats" key="panel repeats" defaultToClosed={true}> <OptionsGroup title="Panel repeats" key="panel repeats" defaultToClosed={true}>
<Forms.Field <Forms.Field
label="Repeat by variable" label="Repeat by variable"
@ -138,7 +140,6 @@ export const PanelOptionsTab: FC<Props> = ({
</Forms.Field> </Forms.Field>
)} )}
</OptionsGroup> </OptionsGroup>
</>
); );
return <>{elements}</>; return <>{elements}</>;

2
public/app/plugins/panel/table2/TablePanel.tsx
View File

@ -20,6 +20,6 @@ export class TablePanel extends Component<Props> {
return <div>No Table Data...</div>; return <div>No Table Data...</div>;
} }
return <Table height={height} width={width} data={data.series[0]} noHeader={!options.showHeader} />; return <Table height={height - 16} width={width} data={data.series[0]} noHeader={!options.showHeader} />;
} }
} }

1
public/app/plugins/panel/table2/module.tsx
View File

@ -15,7 +15,6 @@ export const plugin = new PanelPlugin<Options, CustomFieldConfig>(TablePanel)
min: 20, min: 20,
max: 300, max: 300,
}, },
defaultValue: 1,
}) })
.addSelect({ .addSelect({
id: 'displayMode', id: 'displayMode',