diff --git a/public/app/features/datasources/DataSourcesListPage.tsx b/public/app/features/datasources/DataSourcesListPage.tsx index 4784bdfda40..386a9b5621d 100644 --- a/public/app/features/datasources/DataSourcesListPage.tsx +++ b/public/app/features/datasources/DataSourcesListPage.tsx @@ -37,7 +37,7 @@ export interface Props { } const emptyListModel = { - title: 'There are no data sources defined yet', + title: 'No data sources defined', buttonIcon: 'database' as IconName, buttonLink: 'datasources/new', buttonTitle: 'Add data source', diff --git a/public/app/features/datasources/NewDataSourcePage.tsx b/public/app/features/datasources/NewDataSourcePage.tsx index 051180e6906..0a2befcad12 100644 --- a/public/app/features/datasources/NewDataSourcePage.tsx +++ b/public/app/features/datasources/NewDataSourcePage.tsx @@ -103,8 +103,8 @@ class NewDataSourcePage extends PureComponent { <>

- Note that unsigned front-end datasource plugins are still usable, but this is subject - to change in the upcoming releases of Grafana + Note that unsigned front-end data source plugins are still usable, but this is subject to change in + the upcoming releases of Grafana.

diff --git a/public/app/features/datasources/settings/BasicSettings.tsx b/public/app/features/datasources/settings/BasicSettings.tsx index 5816563ef70..1271672e6e6 100644 --- a/public/app/features/datasources/settings/BasicSettings.tsx +++ b/public/app/features/datasources/settings/BasicSettings.tsx @@ -18,7 +18,7 @@ const BasicSettings: FC = ({ dataSourceName, isDefault, onDefaultChange,
diff --git a/public/app/features/datasources/settings/ButtonRow.tsx b/public/app/features/datasources/settings/ButtonRow.tsx index 2a9a6dfcaf5..3fd78a42bf0 100644 --- a/public/app/features/datasources/settings/ButtonRow.tsx +++ b/public/app/features/datasources/settings/ButtonRow.tsx @@ -21,7 +21,7 @@ const ButtonRow: FC = ({ isReadOnly, onDelete, onSubmit, onTest }) => { onClick={(event) => onSubmit(event)} aria-label={selectors.pages.DataSource.saveAndTest} > - Save & Test + Save & test )} {isReadOnly && ( diff --git a/public/app/features/datasources/settings/CloudInfoBox.tsx b/public/app/features/datasources/settings/CloudInfoBox.tsx index 28ee4730f28..f9e92dd5b5f 100644 --- a/public/app/features/datasources/settings/CloudInfoBox.tsx +++ b/public/app/features/datasources/settings/CloudInfoBox.tsx @@ -56,7 +56,7 @@ export const CloudInfoBox: FC = ({ dataSource }) => { }} >
- Or skip the effort and get {mainDS} (and {extraDS}) as fully managed, scalable and hosted data sources + Or skip the effort and get {mainDS} (and {extraDS}) as fully-managed, scalable, and hosted data sources from Grafana Labs with the{' '} { renderIsReadOnlyMessage() { return ( - This datasource was added by config and cannot be modified using the UI. Please contact your server admin to - update this datasource. + This data source was added by config and cannot be modified using the UI. Please contact your server admin to + update this data source. ); } @@ -197,7 +197,7 @@ export class DataSourceSettingsPage extends PureComponent { } } - return
Page Not Found: {page}
; + return
Page not found: {page}
; } renderSettings() { diff --git a/public/app/features/datasources/settings/PluginSettings.tsx b/public/app/features/datasources/settings/PluginSettings.tsx index 9e4b84e22fe..b0f3375a040 100644 --- a/public/app/features/datasources/settings/PluginSettings.tsx +++ b/public/app/features/datasources/settings/PluginSettings.tsx @@ -46,7 +46,7 @@ export class PluginSettings extends PureComponent { if (!plugin.components.ConfigEditor) { // React editor is not specified, let's render angular editor - // How to apprach this better? Introduce ReactDataSourcePlugin interface and typeguard it here? + // How to approach this better? Introduce ReactDataSourcePlugin interface and typeguard it here? const loader = getAngularLoader(); const template = ''; diff --git a/public/app/features/datasources/settings/__snapshots__/BasicSettings.test.tsx.snap b/public/app/features/datasources/settings/__snapshots__/BasicSettings.test.tsx.snap index e9ee2a6f705..a91abfb7c9f 100644 --- a/public/app/features/datasources/settings/__snapshots__/BasicSettings.test.tsx.snap +++ b/public/app/features/datasources/settings/__snapshots__/BasicSettings.test.tsx.snap @@ -17,7 +17,7 @@ exports[`Render should render component 1`] = ` } > Name diff --git a/public/app/features/datasources/settings/__snapshots__/ButtonRow.test.tsx.snap b/public/app/features/datasources/settings/__snapshots__/ButtonRow.test.tsx.snap index 94823ff3dfc..97853450fca 100644 --- a/public/app/features/datasources/settings/__snapshots__/ButtonRow.test.tsx.snap +++ b/public/app/features/datasources/settings/__snapshots__/ButtonRow.test.tsx.snap @@ -40,7 +40,7 @@ exports[`Render should render with buttons enabled 1`] = ` onClick={[Function]} type="submit" > - Save & Test + Save & test } @@ -109,7 +109,7 @@ class DashboardImportUnConnected extends PureComponent {