Skip to content
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

[Canvas] Use compressed forms in sidebar #49419

Merged
merged 13 commits into from
Nov 15, 2019
Merged

[Canvas] Use compressed forms in sidebar #49419

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
86078b5
compressed sidebar design
ryankeairns Oct 25, 2019
dbaa39b
add back metric help, style no datasource msg
ryankeairns Oct 25, 2019
8485dba
re-style remove button
ryankeairns Oct 29, 2019
9f9f7a5
re-style element status section
ryankeairns Oct 29, 2019
3a80c67
remove unused component import
ryankeairns Oct 29, 2019
823e62d
update storyshots
ryankeairns Oct 29, 2019
c0605b5
clean up unused i18n values
ryankeairns Oct 29, 2019
73842cd
address feedback
ryankeairns Oct 30, 2019
10ae5ca
address i81n feedback
ryankeairns Oct 31, 2019
0cce134
update storyshot
ryankeairns Oct 31, 2019
7fd5679
convert string to i18n
ryankeairns Nov 1, 2019
0abc87f
style grouped sidebar messages
ryankeairns Nov 15, 2019
dbcd09d
update storyshots
ryankeairns Nov 15, 2019
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
Prev Previous commit
Next Next commit
add back metric help, style no datasource msg
  • Loading branch information
@ryankeairns
ryankeairns committed Nov 15, 2019
commit dbaa39bb644a06b8d78818ae14ab1c50f8162650
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/models/math.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const math = () => ({
{
name: '_',
displayName: strings.getValueDisplayName(),
help: '',
help: strings.getValueHelp(),
argType: 'datacolumn',
options: {
onlyMath: false,
Expand Down
4 changes: 2 additions & 2 deletions x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/metric.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ export const metric = () => ({
{
name: 'metricFormat',
displayName: strings.getMetricFormatDisplayName(),
help: '',
help: strings.getMetricFormatHelp(),
argType: 'numberFormat',
default: `"${AdvancedSettings.get('format:number:defaultPattern')}"`,
},
{
name: '_',
displayName: strings.getLabelDisplayName(),
help: '',
help: strings.getLabelHelp(),
argType: 'string',
default: '""',
},
Expand Down
4 changes: 2 additions & 2 deletions x-pack/legacy/plugins/canvas/i18n/ui.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ export const ViewStrings = {
}),
getLabelHelp: () =>
i18n.translate('xpack.canvas.uis.views.metric.args.labelArgLabel', {
defaultMessage: 'Describes the metric',
defaultMessage: 'Enter a text label for the metric value',
}),
getMetricFontDisplayName: () =>
i18n.translate('xpack.canvas.uis.views.metric.args.metricFontTitle', {
Expand All @@ -651,7 +651,7 @@ export const ViewStrings = {
}),
getMetricFormatHelp: () =>
i18n.translate('xpack.canvas.uis.views.metric.args.metricFormatLabel', {
defaultMessage: 'Fonts, alignment and color',
defaultMessage: 'Select a format for the metric value',
}),
},
Pie: {
Expand Down
11 changes: 5 additions & 6 deletions x-pack/legacy/plugins/canvas/public/components/datasource/no_datasource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@

import React from 'react';
import PropTypes from 'prop-types';
import { EuiPanel, EuiText } from '@elastic/eui';
import { EuiCallOut } from '@elastic/eui';

import { ComponentStrings } from '../../../i18n';
const { DatasourceNoDatasource: strings } = ComponentStrings;

export const NoDatasource = () => (
<EuiPanel>
<EuiText>
<h4>{strings.getPanelTitle()}</h4>
<div className="canvasDataSource__section">
<EuiCallOut title={strings.getPanelTitle()} iconType="iInCircle">
<p>{strings.getPanelDescription()}</p>
</EuiText>
</EuiPanel>
</EuiCallOut>
</div>
);

NoDatasource.propTypes = {
Expand Down