Skip to content

Commit

Permalink
Changing it back🤦🏾‍♀️
Browse files Browse the repository at this point in the history
  • Loading branch information
junlincc committed Jan 10, 2021
1 parent 91d92f9 commit 39f03a0
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions superset-frontend/src/datasource/ChangeDatasourceModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ import Loading from '../components/Loading';
import withToasts from '../messageToasts/enhancers/withToasts';

const CONFIRM_WARNING_MESSAGE = t(
'Warning! Changing the datasource may break the chart if the metadata does not exist.',
'Warning! Changing the dataset may break the chart if the metadata does not exist.',
);

const CHANGE_WARNING_MSG = t(
'Changing the datasource may break the chart if the chart relies ' +
'on columns or metadata that does not exist in the target datasource',
'Changing the dataset may break the chart if the chart relies ' +
'on columns or metadata that does not exist in the target dataset',
);

interface Datasource {
Expand Down Expand Up @@ -111,7 +111,7 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
const {
state: { loading, resourceCollection },
fetchData,
} = useListViewResource<Dataset>('dataset', t('datasource'), addDangerToast);
} = useListViewResource<Dataset>('dataset', t('dataset'), addDangerToast);

const selectDatasource = useCallback((datasource: Datasource) => {
setConfirmChange(true);
Expand Down Expand Up @@ -190,7 +190,7 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
);
});
onHide();
addSuccessToast('Successfully changed datasource!');
addSuccessToast('Successfully changed dataset!');
};

const handlerCancelConfirm = () => {
Expand Down Expand Up @@ -223,7 +223,7 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
show={show}
onHide={onHide}
responsive
title={t('Change Datasource')}
title={t('Change Dataset')}
footer={
<>
{confirmChange && (
Expand Down
10 changes: 5 additions & 5 deletions superset-frontend/src/datasource/DatasourceEditor.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ class DatasourceEditor extends React.PureComponent {
fieldKey="default_endpoint"
label={t('Default URL')}
description={t(
'Default URL to redirect to when accessing from the datasource list page',
'Default URL to redirect to when accessing from the dataset list page',
)}
control={<TextControl controlId="default_endpoint" />}
/>
Expand Down Expand Up @@ -563,7 +563,7 @@ class DatasourceEditor extends React.PureComponent {
<Field
fieldKey="owners"
label={t('Owners')}
description={t('Owners of the datasource')}
description={t('Owners of the dataset')}
control={
<SelectAsyncControl
dataEndpoint="api/v1/dataset/related/owners"
Expand Down Expand Up @@ -695,14 +695,14 @@ class DatasourceEditor extends React.PureComponent {
/>
<Field
fieldKey="table_name"
label={t('datasource name')}
label={t('dataset name')}
control={
<TextControl
controlId="table_name"
onChange={table => {
this.onDatasourcePropChange('table_name', table);
}}
placeholder={t('datasource name')}
placeholder={t('dataset name')}
disabled={!this.state.isEditMode}
/>
}
Expand Down Expand Up @@ -954,7 +954,7 @@ class DatasourceEditor extends React.PureComponent {
<Alert bsStyle="warning">
<strong>{t('Be careful.')} </strong>
{t(
'Changing these settings will affect all charts using this datasource, including charts owned by other people.',
'Changing these settings will affect all charts using this dataset, including charts owned by other people.',
)}
</Alert>
</div>
Expand Down
6 changes: 3 additions & 3 deletions superset-frontend/src/datasource/DatasourceModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
},
})
.then(({ json }) => {
addSuccessToast(t('The datasource has been saved'));
addSuccessToast(t('The dataset has been saved'));
onDatasourceSave(json);
onHide();
})
Expand Down Expand Up @@ -147,7 +147,7 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
<Alert bsStyle="warning" className="pointer" onClick={closeDialog}>
<div>
<i className="fa fa-exclamation-triangle" />{' '}
{t(`The datasource configuration exposed here
{t(`The dataset configuration exposed here
affects all the charts using this datasource.
Be mindful that changing settings
here may affect other charts
Expand All @@ -173,7 +173,7 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
onHide={onHide}
title={
<span>
{t('Edit Datasource ')}
{t('Edit Dataset ')}
<strong>{currentDatasource.table_name}</strong>
</span>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ function ExploreViewContainer(props) {
}
>
<div className="title-container">
<span className="horizont al-text">{t('Datasource')}</span>
<span className="horizont al-text">{t('Dataset')}</span>
<span
role="button"
tabIndex={0}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,10 @@ class DatasourceControl extends React.PureComponent {
<Menu onClick={this.handleMenuItemClick}>
{this.props.isEditable && (
<Menu.Item key={EDIT_DATASET} data-test="edit-dataset">
{t('Edit Datasource')}
{t('Edit Dataset')}
</Menu.Item>
)}
<Menu.Item key={CHANGE_DATASET}>{t('Change Datasource')}</Menu.Item>
<Menu.Item key={CHANGE_DATASET}>{t('Change Dataset')}</Menu.Item>
<Menu.Item key={VIEW_IN_SQL_LAB}>{t('View in SQL Lab')}</Menu.Item>
</Menu>
);
Expand Down Expand Up @@ -187,7 +187,7 @@ class DatasourceControl extends React.PureComponent {
trigger={['click']}
data-test="datasource-menu"
>
<Tooltip title={t('More datasource related options')}>
<Tooltip title={t('More dataset related options')}>
<Icon
className="datasource-modal-trigger"
data-test="datasource-menu-trigger"
Expand Down

0 comments on commit 39f03a0

Please sign in to comment.