mirror of
https://github.com/apache/superset.git
synced 2026-07-18 20:55:47 +00:00
feat(explore): Integrate dataset panel with Folders feature (#33104)
Co-authored-by: Kamil Gabryjelski <kamil.gabryjelski@gmail.com>
This commit is contained in:
committed by
GitHub
parent
a5a91d5e48
commit
7b9ebbe735
@@ -202,7 +202,11 @@ test('cannot drop a column that is not part of the simple column selection', ()
|
||||
type={DndItemType.Column}
|
||||
/>
|
||||
<DatasourcePanelDragOption
|
||||
value={{ metric_name: 'metric_a', expression: 'AGG(metric_a)' }}
|
||||
value={{
|
||||
metric_name: 'metric_a',
|
||||
expression: 'AGG(metric_a)',
|
||||
uuid: '1',
|
||||
}}
|
||||
type={DndItemType.Metric}
|
||||
/>
|
||||
{setup({
|
||||
@@ -377,11 +381,11 @@ describe('when disallow_adhoc_metrics is set', () => {
|
||||
type={DndItemType.Column}
|
||||
/>
|
||||
<DatasourcePanelDragOption
|
||||
value={{ metric_name: 'metric_a' }}
|
||||
value={{ metric_name: 'metric_a', uuid: '1' }}
|
||||
type={DndItemType.Metric}
|
||||
/>
|
||||
<DatasourcePanelDragOption
|
||||
value={{ metric_name: 'avg__num' }}
|
||||
value={{ metric_name: 'avg__num', uuid: '2' }}
|
||||
type={DndItemType.AdhocMetricOption}
|
||||
/>
|
||||
{setup({
|
||||
|
||||
@@ -334,7 +334,7 @@ test('cannot drop a duplicated item', () => {
|
||||
const { getByTestId } = render(
|
||||
<>
|
||||
<DatasourcePanelDragOption
|
||||
value={{ metric_name: 'metric_a' }}
|
||||
value={{ metric_name: 'metric_a', uuid: '1' }}
|
||||
type={DndItemType.Metric}
|
||||
/>
|
||||
<DndMetricSelect {...defaultProps} value={metricValues} multi />
|
||||
@@ -362,7 +362,7 @@ test('can drop a saved metric when disallow_adhoc_metrics', () => {
|
||||
const { getByTestId } = render(
|
||||
<>
|
||||
<DatasourcePanelDragOption
|
||||
value={{ metric_name: 'metric_a' }}
|
||||
value={{ metric_name: 'metric_a', uuid: '1' }}
|
||||
type={DndItemType.Metric}
|
||||
/>
|
||||
<DndMetricSelect
|
||||
@@ -395,15 +395,15 @@ test('cannot drop non-saved metrics when disallow_adhoc_metrics', () => {
|
||||
const { getByTestId, getAllByTestId } = render(
|
||||
<>
|
||||
<DatasourcePanelDragOption
|
||||
value={{ metric_name: 'metric_a' }}
|
||||
value={{ metric_name: 'metric_a', uuid: '1' }}
|
||||
type={DndItemType.Metric}
|
||||
/>
|
||||
<DatasourcePanelDragOption
|
||||
value={{ metric_name: 'metric_c' }}
|
||||
value={{ metric_name: 'metric_c', uuid: '2' }}
|
||||
type={DndItemType.Metric}
|
||||
/>
|
||||
<DatasourcePanelDragOption
|
||||
value={{ column_name: 'column_1' }}
|
||||
value={{ column_name: 'column_1', uuid: '3' }}
|
||||
type={DndItemType.Column}
|
||||
/>
|
||||
<DndMetricSelect
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
|
||||
import { useCallback, useEffect, useMemo, useState } from 'react';
|
||||
import { nanoid } from 'nanoid';
|
||||
import {
|
||||
ensureIsArray,
|
||||
GenericDataType,
|
||||
@@ -77,6 +78,7 @@ const coerceMetrics = (
|
||||
return {
|
||||
metric_name: metric,
|
||||
error_text: t('This metric might be incompatible with current dataset'),
|
||||
uuid: nanoid(),
|
||||
};
|
||||
}
|
||||
if (!isDictionaryForAdhocMetric(metric)) {
|
||||
|
||||
Reference in New Issue
Block a user