Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Configurable default row limit for native filters #24043

Merged
merged 3 commits into from
Jun 12, 2023
Merged

feat: Configurable default row limit for native filters #24043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0db4eb2
Configurable default row limit for native filters
May 12, 2023
a85db9f
Merge branch 'master' of github.com:cleslie/superset into filter-limi…
May 16, 2023
d7988e2
Merge branch 'master' into filter-limit-config
May 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion superset-frontend/src/dashboard/components/nativeFilters/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ import extractUrlParams from 'src/dashboard/util/extractUrlParams';
import { isFeatureEnabled } from 'src/featureFlags';
import { CHART_TYPE, TAB_TYPE } from '../../util/componentTypes';
import { DASHBOARD_GRID_ID, DASHBOARD_ROOT_ID } from '../../util/constants';
import getBootstrapData from '../../../utils/getBootstrapData';

const getDefaultRowLimit = (): number => {
const bootstrapData = getBootstrapData();
const nativeFilterDefaultRowLimit =
bootstrapData?.common?.conf?.NATIVE_FILTER_DEFAULT_ROW_LIMIT;
return nativeFilterDefaultRowLimit || 1000;
};

export const getFormData = ({
datasetId,
Expand Down Expand Up @@ -75,7 +83,7 @@ export const getFormData = ({
extra_form_data: dependencies,
granularity_sqla,
metrics: ['count'],
row_limit: 1000,
row_limit: getDefaultRowLimit(),
showSearch: true,
defaultValue: defaultDataMask?.filterState?.value,
time_range,
Expand Down
2 changes: 2 additions & 0 deletions superset/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ def _try_json_readsha(filepath: str, length: int) -> Optional[str]:
ROW_LIMIT = 50000
# default row limit when requesting samples from datasource in explore view
SAMPLES_ROW_LIMIT = 1000
# default row limit for native filters
NATIVE_FILTER_DEFAULT_ROW_LIMIT = 1000
# max rows retrieved by filter select auto complete
FILTER_SELECT_ROW_LIMIT = 10000
# default time filter in explore
Expand Down
1 change: 1 addition & 0 deletions superset/views/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
"ALERT_REPORTS_DEFAULT_CRON_VALUE",
"ALERT_REPORTS_DEFAULT_RETENTION",
"ALERT_REPORTS_DEFAULT_WORKING_TIMEOUT",
"NATIVE_FILTER_DEFAULT_ROW_LIMIT",
)

logger = logging.getLogger(__name__)
Expand Down