From 6731cd0be6852c890a5e856e79470d08eb760437 Mon Sep 17 00:00:00 2001 From: "Michael S. Molina" <70410625+michael-s-molina@users.noreply.github.com> Date: Tue, 12 Jan 2021 15:47:55 -0300 Subject: [PATCH] chore: apply capitalization guidelines - iteration 1 (#12447) Apply capitalization guidelines defined in #12343 Use sentence casing for most places. --- .../utils/getControlsForVizType_spec.js | 2 +- superset-frontend/src/chart/chartAction.js | 2 +- .../src/common/components/common.stories.tsx | 14 +++++++------- .../src/components/AnchorLink.jsx | 2 +- .../src/components/EditableTitle.tsx | 2 +- .../src/components/OmniContainer.jsx | 2 +- .../DateFilterControl/DateFilterControl.tsx | 12 ++++++------ .../controls/DateFilterControl/constants.ts | 2 +- .../controls/DateFilterControl/types.ts | 2 +- superset-frontend/src/explore/constants.js | 8 ++++---- superset-frontend/src/explore/controls.jsx | 18 +++++++++--------- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/superset-frontend/spec/javascripts/utils/getControlsForVizType_spec.js b/superset-frontend/spec/javascripts/utils/getControlsForVizType_spec.js index 3819782eb7..6e06b18998 100644 --- a/superset-frontend/spec/javascripts/utils/getControlsForVizType_spec.js +++ b/superset-frontend/spec/javascripts/utils/getControlsForVizType_spec.js @@ -83,7 +83,7 @@ describe('getControlsForVizType', () => { JSON.stringify({ label_colors: { type: 'ColorMapControl', - label: t('Color Map'), + label: t('Color map'), default: {}, renderTrigger: true, mapStateToProps: state => ({ diff --git a/superset-frontend/src/chart/chartAction.js b/superset-frontend/src/chart/chartAction.js index 802208e451..74ed410f96 100644 --- a/superset-frontend/src/chart/chartAction.js +++ b/superset-frontend/src/chart/chartAction.js @@ -301,7 +301,7 @@ export function runAnnotationQuery( dispatch( annotationQueryFailed( annotation, - { error: 'Query Timeout' }, + { error: 'Query timeout' }, sliceKey, ), ); diff --git a/superset-frontend/src/common/components/common.stories.tsx b/superset-frontend/src/common/components/common.stories.tsx index dab4951fc5..6c9abb0fbf 100644 --- a/superset-frontend/src/common/components/common.stories.tsx +++ b/superset-frontend/src/common/components/common.stories.tsx @@ -38,14 +38,14 @@ import Collapse from './Collapse'; import { CronPicker, CronError } from './CronPicker'; export default { - title: 'Common Components', + title: 'Common components', decorators: [withKnobs], }; export const StyledModal = () => ( ( Tab 1 Content! Tab 2 Content! @@ -88,14 +88,14 @@ export const StyledEditableTabs = () => ( Tab 1 Content! Tab 2 Content! @@ -123,7 +123,7 @@ export const TabsWithDropdownMenu = () => ( } key="1" - disabled={boolean('Tab 1 Disabled', false)} + disabled={boolean('Tab 1 disabled', false)} > Tab 1 Content! diff --git a/superset-frontend/src/components/AnchorLink.jsx b/superset-frontend/src/components/AnchorLink.jsx index 26d9ed75bf..f98bd66669 100644 --- a/superset-frontend/src/components/AnchorLink.jsx +++ b/superset-frontend/src/components/AnchorLink.jsx @@ -85,7 +85,7 @@ class AnchorLink extends React.PureComponent { filters, anchorLinkId, )} - emailSubject={t('Superset Chart')} + emailSubject={t('Superset chart')} emailContent={t('Check out this chart in dashboard:')} placement={placement} /> diff --git a/superset-frontend/src/components/EditableTitle.tsx b/superset-frontend/src/components/EditableTitle.tsx index 4085bad060..5f4f7a482d 100644 --- a/superset-frontend/src/components/EditableTitle.tsx +++ b/superset-frontend/src/components/EditableTitle.tsx @@ -178,7 +178,7 @@ export default function EditableTitle({ label="title" tooltip={ canEdit - ? t('click to edit') + ? t('Click to edit') : noPermitTooltip || t("You don't have the rights to alter this title.") } diff --git a/superset-frontend/src/components/OmniContainer.jsx b/superset-frontend/src/components/OmniContainer.jsx index 22a4c50e59..e641a7c3af 100644 --- a/superset-frontend/src/components/OmniContainer.jsx +++ b/superset-frontend/src/components/OmniContainer.jsx @@ -41,7 +41,7 @@ const getDashboards = query => })), ) .catch(() => ({ - title: t('An error occurred while fethching Dashboards'), + title: t('An error occurred while fetching dashboards'), })); const OmniModal = styled(Modal)` diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx index fc440a25bd..6903c2c98e 100644 --- a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx +++ b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx @@ -60,7 +60,7 @@ const guessFrame = (timeRange: string): FrameType => { return 'Calendar'; } if (timeRange === 'No filter') { - return 'No Filter'; + return 'No filter'; } if (customTimeRangeDecode(timeRange).matchedFlag) { return 'Custom'; @@ -251,7 +251,7 @@ export default function DateFilterControl(props: DateFilterLabelProps) { }; function onFrame(option: SelectOptionType) { - if (option.value === 'No Filter') { + if (option.value === 'No filter') { setTimeRangeValue('No filter'); } setFrame(option.value as FrameType); @@ -266,7 +266,7 @@ export default function DateFilterControl(props: DateFilterLabelProps) { onChange={onFrame} className="frame-dropdown" /> - {frame !== 'No Filter' && } + {frame !== 'No filter' && } {frame === 'Common' && ( )} @@ -279,10 +279,10 @@ export default function DateFilterControl(props: DateFilterLabelProps) { {frame === 'Custom' && ( )} - {frame === 'No Filter' &&
} + {frame === 'No filter' &&
}
-
{t('Actual Time Range')}
+
{t('Actual time range')}
{validTimeRange &&
{evalResponse}
} {!validTimeRange && ( @@ -321,7 +321,7 @@ export default function DateFilterControl(props: DateFilterLabelProps) { const title = ( - {t('Edit Time Range')} + {t('Edit time range')} ); diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/constants.ts b/superset-frontend/src/explore/components/controls/DateFilterControl/constants.ts index d1ec0a8c53..175b36c209 100644 --- a/superset-frontend/src/explore/components/controls/DateFilterControl/constants.ts +++ b/superset-frontend/src/explore/components/controls/DateFilterControl/constants.ts @@ -32,7 +32,7 @@ export const FRAME_OPTIONS: SelectOptionType[] = [ { value: 'Calendar', label: t('Previous') }, { value: 'Custom', label: t('Custom') }, { value: 'Advanced', label: t('Advanced') }, - { value: 'No Filter', label: t('No Filter') }, + { value: 'No filter', label: t('No filter') }, ]; export const COMMON_RANGE_OPTIONS: SelectOptionType[] = [ diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/types.ts b/superset-frontend/src/explore/components/controls/DateFilterControl/types.ts index 5b264b99ef..1d400de29d 100644 --- a/superset-frontend/src/explore/components/controls/DateFilterControl/types.ts +++ b/superset-frontend/src/explore/components/controls/DateFilterControl/types.ts @@ -26,7 +26,7 @@ export type FrameType = | 'Calendar' | 'Custom' | 'Advanced' - | 'No Filter'; + | 'No filter'; export type DateTimeGrainType = | 'second' diff --git a/superset-frontend/src/explore/constants.js b/superset-frontend/src/explore/constants.js index 2232fe5d81..4a771d04be 100644 --- a/superset-frontend/src/explore/constants.js +++ b/superset-frontend/src/explore/constants.js @@ -77,11 +77,11 @@ export const sqlaAutoGeneratedMetricRegex = /^(LONG|DOUBLE|FLOAT)?(SUM|AVG|MAX|M export const druidAutoGeneratedMetricRegex = /^(LONG|DOUBLE|FLOAT)?(SUM|MAX|MIN|COUNT)\([A-Z0-9_."]*\)$/i; export const TIME_FILTER_LABELS = { - time_range: t('Time Range'), - granularity_sqla: t('Time Column'), - time_grain_sqla: t('Time Grain'), + time_range: t('Time range'), + granularity_sqla: t('Time column'), + time_grain_sqla: t('Time grain'), druid_time_origin: t('Origin'), - granularity: t('Time Granularity'), + granularity: t('Time granularity'), }; export const FILTER_CONFIG_ATTRIBUTES = { diff --git a/superset-frontend/src/explore/controls.jsx b/superset-frontend/src/explore/controls.jsx index c94f9d050b..dfbfd21f56 100644 --- a/superset-frontend/src/explore/controls.jsx +++ b/superset-frontend/src/explore/controls.jsx @@ -203,13 +203,13 @@ export const controls = { viz_type: { type: 'VizTypeControl', - label: t('Visualization Type'), + label: t('Visualization type'), default: 'table', description: t('The type of visualization to display'), }, color_picker: { - label: t('Fixed Color'), + label: t('Fixed color'), description: t('Use this to define a static color for all circles'), type: 'ColorPickerControl', default: PRIMARY_COLOR, @@ -218,14 +218,14 @@ export const controls = { metric_2: { ...metric, - label: t('Right Axis Metric'), + label: t('Right axis metric'), clearable: true, description: t('Choose a metric for right axis'), }, linear_color_scheme: { type: 'ColorSchemeControl', - label: t('Linear Color Scheme'), + label: t('Linear color scheme'), choices: () => sequentialSchemeRegistry.values().map(value => [value.id, value.label]), default: sequentialSchemeRegistry.getDefaultKey(), @@ -238,7 +238,7 @@ export const controls = { secondary_metric: { ...metric, - label: t('Color Metric'), + label: t('Color metric'), default: null, validators: [], description: t('A metric to use for color'), @@ -385,7 +385,7 @@ export const controls = { timeseries_limit_metric: { type: 'MetricsControl', - label: t('Sort By'), + label: t('Sort by'), default: null, clearable: true, description: t('Metric used to define the top series'), @@ -433,7 +433,7 @@ export const controls = { size: { ...metric, - label: t('Bubble Size'), + label: t('Bubble size'), default: null, }, @@ -479,7 +479,7 @@ export const controls = { color_scheme: { type: 'ColorSchemeControl', - label: t('Color Scheme'), + label: t('Color scheme'), default: categoricalSchemeRegistry.getDefaultKey(), renderTrigger: true, choices: () => categoricalSchemeRegistry.keys().map(s => [s, s]), @@ -489,7 +489,7 @@ export const controls = { label_colors: { type: 'ColorMapControl', - label: t('Color Map'), + label: t('Color map'), default: {}, renderTrigger: true, mapStateToProps: state => ({