You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by vi...@apache.org on 2021/08/10 05:01:30 UTC
[superset] 20/25: chore(explore): change dnd placeholders (#16116)
This is an automated email from the ASF dual-hosted git repository.
villebro pushed a commit to branch 1.3
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 60ad321dcdc2028f3dad42db2657fe1b4d1afe7f
Author: Kamil Gabryjelski <ka...@gmail.com>
AuthorDate: Mon Aug 9 17:50:11 2021 +0200
chore(explore): change dnd placeholders (#16116)
* chore(explore): change dnd placeholders
* Fix tests and lint
(cherry picked from commit 6ac4f4ef2fbd7c717a41f33ae511a54f3e10f098)
---
.../controls/DndColumnSelectControl/DndColumnSelect.test.tsx | 2 +-
.../controls/DndColumnSelectControl/DndColumnSelect.tsx | 3 ++-
.../controls/DndColumnSelectControl/DndFilterSelect.test.tsx | 8 ++++----
.../controls/DndColumnSelectControl/DndFilterSelect.tsx | 2 +-
.../controls/DndColumnSelectControl/DndMetricSelect.test.tsx | 4 ++--
.../controls/DndColumnSelectControl/DndMetricSelect.tsx | 4 ++--
.../controls/DndColumnSelectControl/DndSelectLabel.test.tsx | 2 +-
.../components/controls/DndColumnSelectControl/DndSelectLabel.tsx | 2 +-
8 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.test.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.test.tsx
index 3a13258..93d00a7 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.test.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.test.tsx
@@ -29,7 +29,7 @@ const defaultProps: LabelProps = {
test('renders with default props', () => {
render(<DndColumnSelect {...defaultProps} />, { useDnd: true });
- expect(screen.getByText('Drop columns')).toBeInTheDocument();
+ expect(screen.getByText('Drop columns here')).toBeInTheDocument();
});
test('renders with value', () => {
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.tsx
index e8f64db..46b3889 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.tsx
@@ -143,7 +143,8 @@ export const DndColumnSelect = (props: LabelProps) => {
accept={DndItemType.Column}
displayGhostButton={multi || optionSelector.values.length === 0}
ghostButtonText={
- ghostButtonText || tn('Drop column', 'Drop columns', multi ? 2 : 1)
+ ghostButtonText ||
+ tn('Drop column here', 'Drop columns here', multi ? 2 : 1)
}
{...props}
/>
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.test.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.test.tsx
index bf7d135..bddb80a 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.test.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.test.tsx
@@ -38,7 +38,7 @@ const defaultProps = {
test('renders with default props', () => {
render(<DndFilterSelect {...defaultProps} />, { useDnd: true });
- expect(screen.getByText('Drop columns or metrics')).toBeInTheDocument();
+ expect(screen.getByText('Drop columns or metrics here')).toBeInTheDocument();
});
test('renders with value', () => {
@@ -56,7 +56,7 @@ test('renders options with saved metric', () => {
render(<DndFilterSelect {...defaultProps} formData={['saved_metric']} />, {
useDnd: true,
});
- expect(screen.getByText('Drop columns or metrics')).toBeInTheDocument();
+ expect(screen.getByText('Drop columns or metrics here')).toBeInTheDocument();
});
test('renders options with column', () => {
@@ -76,7 +76,7 @@ test('renders options with column', () => {
useDnd: true,
},
);
- expect(screen.getByText('Drop columns or metrics')).toBeInTheDocument();
+ expect(screen.getByText('Drop columns or metrics here')).toBeInTheDocument();
});
test('renders options with adhoc metric', () => {
@@ -87,5 +87,5 @@ test('renders options with adhoc metric', () => {
render(<DndFilterSelect {...defaultProps} formData={[adhocMetric]} />, {
useDnd: true,
});
- expect(screen.getByText('Drop columns or metrics')).toBeInTheDocument();
+ expect(screen.getByText('Drop columns or metrics here')).toBeInTheDocument();
});
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx
index dc7e892..66849b2 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx
@@ -374,7 +374,7 @@ export const DndFilterSelect = (props: DndFilterSelectProps) => {
canDrop={canDrop}
valuesRenderer={valuesRenderer}
accept={DND_ACCEPTED_TYPES}
- ghostButtonText={t('Drop columns or metrics')}
+ ghostButtonText={t('Drop columns or metrics here')}
{...props}
/>
<AdhocFilterPopoverTrigger
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.test.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.test.tsx
index 51fb9aa..71cf4bf 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.test.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.test.tsx
@@ -31,10 +31,10 @@ const defaultProps = {
test('renders with default props', () => {
render(<DndMetricSelect {...defaultProps} />, { useDnd: true });
- expect(screen.getByText('Drop column or metric')).toBeInTheDocument();
+ expect(screen.getByText('Drop column or metric here')).toBeInTheDocument();
});
test('renders with default props and multi = true', () => {
render(<DndMetricSelect {...defaultProps} multi />, { useDnd: true });
- expect(screen.getByText('Drop columns or metrics')).toBeInTheDocument();
+ expect(screen.getByText('Drop columns or metrics here')).toBeInTheDocument();
});
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.tsx
index 77dbfa3..ed32e1b 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.tsx
@@ -334,8 +334,8 @@ export const DndMetricSelect = (props: any) => {
valuesRenderer={valuesRenderer}
accept={DND_ACCEPTED_TYPES}
ghostButtonText={tn(
- 'Drop column or metric',
- 'Drop columns or metrics',
+ 'Drop column or metric here',
+ 'Drop columns or metrics here',
multi ? 2 : 1,
)}
displayGhostButton={multi || value.length === 0}
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.test.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.test.tsx
index d6090e2..d9689d7 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.test.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.test.tsx
@@ -33,7 +33,7 @@ const defaultProps = {
test('renders with default props', async () => {
render(<DndSelectLabel {...defaultProps} />, { useDnd: true });
- expect(await screen.findByText('Drop columns')).toBeInTheDocument();
+ expect(await screen.findByText('Drop columns here')).toBeInTheDocument();
});
test('renders ghost button when empty', async () => {
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.tsx
index daaeb91..7ffdb17 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.tsx
@@ -55,7 +55,7 @@ export default function DndSelectLabel<T, O>({
return (
<AddControlLabel cancelHover>
<Icons.PlusSmall iconColor={theme.colors.grayscale.light1} />
- {t(props.ghostButtonText || 'Drop columns')}
+ {t(props.ghostButtonText || 'Drop columns here')}
</AddControlLabel>
);
}