IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-19 01:34:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Docs: Field config docs update, Table docs update, Override matcher naming issue (#27558)

Browse Source 
* Docs: Field Config Docs Update, Table Docs update, Override matcher naming sync

* removed sentance that feels duplicated

* Update docs/sources/panels/field-configuration-options.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Update docs/sources/panels/field-configuration-options.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Update docs/sources/panels/field-configuration-options.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Update docs/sources/panels/field-configuration-options.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* removed bad newlines and minor tweaks, still need to figure out naming for matchers in UI and docs

* Updated matcher names and descriptions, and UX

* Updated field override docs

* Fixed plural

* Updated wording

* removed plurals for the selectors heading

* Updated names

* Updated docs

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
This commit is contained in:
Torkel Ödegaard
2020-09-15 14:49:16 +02:00
committed by GitHub
co-authored by Diana Payton
parent 1e4846d443
commit cade6dd010
7 changed files with 68 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/dashboard/components/PanelEditor/FieldConfigEditor.tsx
+2 -2
View File
@@ -78,7 +78,7 @@ export const OverrideFieldConfigEditor: React.FC<Props> = props => {
// TODO: apply matcher to retrieve fields
return (
<OverrideEditor
name={`${fieldMatchersUI.get(o.matcher.id).name}`}
name={`Override ${i + 1}`}
key={`${o.matcher.id}/${i}`}
data={data}
override={o}
@@ -97,7 +97,7 @@ export const OverrideFieldConfigEditor: React.FC<Props> = props => {
<Container padding="md">
<ValuePicker
icon="plus"
label="Add override"
label="Add an override for"
variant="secondary"
options={fieldMatchersUI
.list()
public/app/features/dashboard/components/PanelEditor/OverrideEditor.tsx
+3 -7
View File
@@ -52,11 +52,7 @@ export const OverrideEditor: React.FC<OverrideEditorProps> = ({
const matcherUi = fieldMatchersUI.get(override.matcher.id);
const styles = getStyles(theme);
const matcherLabel = (
<Label category={['Matcher']} description={matcherUi.description}>
{matcherUi.name}
</Label>
);
const matcherLabel = <Label>{matcherUi.name}</Label>;
const onMatcherConfigChange = useCallback(
(matcherConfig: any) => {
@@ -121,7 +117,7 @@ export const OverrideEditor: React.FC<OverrideEditorProps> = ({
{!isExpanded && (
<div className={styles.overrideDetails}>
<div className={styles.options} title={matcherOptions}>
Options <Icon name="angle-right" /> {matcherOptions}
{matcherUi.name} <Icon name="angle-right" /> {matcherOptions}
</div>
<div className={styles.options} title={overriddenProperites}>
Properties overridden <Icon name="angle-right" />
@@ -135,7 +131,7 @@ export const OverrideEditor: React.FC<OverrideEditorProps> = ({
return (
<OptionsGroup renderTitle={renderOverrideTitle} id={name} key={name}>
<Field label={matcherLabel} description={matcherUi.description}>
<Field label={matcherLabel}>
<matcherUi.component
matcher={matcherUi.matcher}
data={data}