-
-
-
-
-
-
- - Singapore -
-- National Day of Singapore is celebrated every year on August - 9, in commemoration of Singapore's independence from - Malaysia in 1965. -
-
-
-
-
-
-
- - New Year -
-- Happy New Year Text for an Amazing 2020. -
-
-
-
-
-
-
- - Design -
-- Free Transparent Verified Badge & Green Tick Icons for Your - Subjects. -
-
-
-
-
-
-
- - Halloween -
-- Huge collection of high-quality and creative Trick Or Treat - transparent images for Halloween 2019. -
-You just hit a route that does not exist... the sadness.
+Sorry, you've requested a page that does not exist.
{t(
diff --git a/superset-frontend/src/explore/components/SaveModal.jsx b/superset-frontend/src/explore/components/SaveModal.jsx
index 1c8626c6dc6f5..c3a42e654535c 100644
--- a/superset-frontend/src/explore/components/SaveModal.jsx
+++ b/superset-frontend/src/explore/components/SaveModal.jsx
@@ -250,5 +250,4 @@ function mapStateToProps({ explore, saveModal }) {
};
}
-export { SaveModal };
export default connect(mapStateToProps, () => ({}))(SaveModal);
diff --git a/superset-frontend/src/explore/components/controls/AnnotationLayer.jsx b/superset-frontend/src/explore/components/controls/AnnotationLayer.jsx
index 8c0b750b2f736..cded668bf7434 100644
--- a/superset-frontend/src/explore/components/controls/AnnotationLayer.jsx
+++ b/superset-frontend/src/explore/components/controls/AnnotationLayer.jsx
@@ -34,8 +34,9 @@ import SelectControl from './SelectControl';
import TextControl from './TextControl';
import CheckboxControl from './CheckboxControl';
-import ANNOTATION_TYPES, {
+import {
ANNOTATION_SOURCE_TYPES,
+ ANNOTATION_TYPES,
ANNOTATION_TYPES_METADATA,
DEFAULT_ANNOTATION_TYPE,
requiresQuery,
@@ -332,7 +333,7 @@ export default class AnnotationLayer extends React.PureComponent {
annotation.color =
annotation.color === AUTOMATIC_COLOR ? null : annotation.color;
this.props.addAnnotationLayer(annotation);
- this.setState({ isNew: false, oldName: this.state.name });
+ this.setState(prevState => ({ isNew: false, oldName: prevState.name }));
}
}
diff --git a/superset-frontend/src/explore/components/controls/BoundsControl.jsx b/superset-frontend/src/explore/components/controls/BoundsControl.jsx
index 5c7c567f33fbb..efdae19a144b5 100644
--- a/superset-frontend/src/explore/components/controls/BoundsControl.jsx
+++ b/superset-frontend/src/explore/components/controls/BoundsControl.jsx
@@ -47,19 +47,21 @@ export default class BoundsControl extends React.Component {
}
onMinChange(event) {
+ const min = event.target.value;
this.setState(
- {
- minMax: [event.target.value, this.state.minMax[1]],
- },
+ prevState => ({
+ minMax: [min, prevState.minMax[1]],
+ }),
this.onChange,
);
}
onMaxChange(event) {
+ const max = event.target.value;
this.setState(
- {
- minMax: [this.state.minMax[0], event.target.value],
- },
+ prevState => ({
+ minMax: [prevState.minMax[0], max],
+ }),
this.onChange,
);
}
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl.jsx b/superset-frontend/src/explore/components/controls/DateFilterControl.jsx
index 9682b7561407a..bd30125153ee2 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl.jsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl.jsx
@@ -128,22 +128,23 @@ function getStateFromSeparator(value) {
function getStateFromCommonTimeFrame(value) {
const units = `${value.split(' ')[1]}s`;
+ let sinceMoment;
+
+ if (value === 'No filter') {
+ sinceMoment = '';
+ } else if (units === 'years') {
+ sinceMoment = moment().utc().startOf(units).subtract(1, units);
+ } else {
+ sinceMoment = moment().utc().startOf('day').subtract(1, units);
+ }
+
return {
tab: TABS.DEFAULTS,
type: TYPES.DEFAULTS,
common: value,
- since:
- value === 'No filter'
- ? ''
- : moment()
- .utc()
- .startOf('day')
- .subtract(1, units)
- .format(MOMENT_FORMAT),
+ since: sinceMoment === '' ? '' : sinceMoment.format(MOMENT_FORMAT),
until:
- value === 'No filter'
- ? ''
- : moment().utc().startOf('day').format(MOMENT_FORMAT),
+ sinceMoment === '' ? '' : sinceMoment.add(1, units).format(MOMENT_FORMAT),
};
}
@@ -259,14 +260,14 @@ class DateFilterControl extends React.Component {
const closeCalendar =
(key === 'since' && this.state.sinceViewMode === 'days') ||
(key === 'until' && this.state.untilViewMode === 'days');
- this.setState({
+ this.setState(prevState => ({
type: TYPES.CUSTOM_START_END,
[key]: typeof value === 'string' ? value : value.format(MOMENT_FORMAT),
- showSinceCalendar: this.state.showSinceCalendar && !closeCalendar,
- showUntilCalendar: this.state.showUntilCalendar && !closeCalendar,
- sinceViewMode: closeCalendar ? 'days' : this.state.sinceViewMode,
- untilViewMode: closeCalendar ? 'days' : this.state.untilViewMode,
- });
+ showSinceCalendar: prevState.showSinceCalendar && !closeCalendar,
+ showUntilCalendar: prevState.showUntilCalendar && !closeCalendar,
+ sinceViewMode: closeCalendar ? 'days' : prevState.sinceViewMode,
+ untilViewMode: closeCalendar ? 'days' : prevState.untilViewMode,
+ }));
}
setTypeCustomRange() {
@@ -396,7 +397,6 @@ class DateFilterControl extends React.Component {
));
const timeFrames = COMMON_TIME_FRAMES.map(timeFrame => {
const nextState = getStateFromCommonTimeFrame(timeFrame);
-
const timeRange = buildTimeRangeString(nextState.since, nextState.until);
return (
diff --git a/superset-frontend/src/explore/components/controls/FixedOrMetricControl.jsx b/superset-frontend/src/explore/components/controls/FixedOrMetricControl.jsx
index 6c8edfc4d6900..d7cf050b21508 100644
--- a/superset-frontend/src/explore/components/controls/FixedOrMetricControl.jsx
+++ b/superset-frontend/src/explore/components/controls/FixedOrMetricControl.jsx
@@ -90,10 +90,9 @@ export default class FixedOrMetricControl extends React.Component {
}
toggle() {
- const expanded = !this.state.expanded;
- this.setState({
- expanded,
- });
+ this.setState(prevState => ({
+ expanded: !prevState.expanded,
+ }));
}
render() {
diff --git a/superset-frontend/src/explore/components/controls/SelectControl.jsx b/superset-frontend/src/explore/components/controls/SelectControl.jsx
index 3182434bc8d96..7ec6c699215c5 100644
--- a/superset-frontend/src/explore/components/controls/SelectControl.jsx
+++ b/superset-frontend/src/explore/components/controls/SelectControl.jsx
@@ -103,7 +103,7 @@ export default class SelectControl extends React.PureComponent {
if (opt) {
if (this.props.multi) {
optionValue = [];
- for (const o of opt) {
+ opt.forEach(o => {
// select all options
if (o.meta === true) {
this.props.onChange(
@@ -114,7 +114,7 @@ export default class SelectControl extends React.PureComponent {
return;
}
optionValue.push(o[this.props.valueKey] || o);
- }
+ });
} else if (opt.meta === true) {
return;
} else {
diff --git a/superset-frontend/src/explore/components/controls/SpatialControl.jsx b/superset-frontend/src/explore/components/controls/SpatialControl.jsx
index 9553200aab5bb..073148be9560b 100644
--- a/superset-frontend/src/explore/components/controls/SpatialControl.jsx
+++ b/superset-frontend/src/explore/components/controls/SpatialControl.jsx
@@ -114,7 +114,7 @@ export default class SpatialControl extends React.Component {
toggleCheckbox() {
this.setState(
- { reverseCheckbox: !this.state.reverseCheckbox },
+ prevState => ({ reverseCheckbox: !prevState.reverseCheckbox }),
this.onChange,
);
}
diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl.jsx b/superset-frontend/src/explore/components/controls/VizTypeControl.jsx
index ee1a4bf6188c6..3f1bd2b89b4a0 100644
--- a/superset-frontend/src/explore/components/controls/VizTypeControl.jsx
+++ b/superset-frontend/src/explore/components/controls/VizTypeControl.jsx
@@ -120,7 +120,7 @@ export default class VizTypeControl extends React.PureComponent {
}
toggleModal() {
- this.setState({ showModal: !this.state.showModal });
+ this.setState(prevState => ({ showModal: !prevState.showModal }));
}
changeSearch(event) {
diff --git a/superset-frontend/src/explore/controlUtils.js b/superset-frontend/src/explore/controlUtils.js
index a273fd46dda7d..c05e4defcc01d 100644
--- a/superset-frontend/src/explore/controlUtils.js
+++ b/superset-frontend/src/explore/controlUtils.js
@@ -51,22 +51,19 @@ export function validateControl(control, processedState) {
/**
* Find control item from control panel config.
*/
-function findControlItem(controlPanelSections, controlKey) {
- for (const section of controlPanelSections) {
- for (const controlArr of section.controlSetRows) {
- for (const control of controlArr) {
- if (controlKey === control) return control;
- if (
- control !== null &&
- typeof control === 'object' &&
- control.name === controlKey
- ) {
- return control;
- }
- }
- }
- }
- return null;
+export function findControlItem(controlPanelSections, controlKey) {
+ return (
+ controlPanelSections
+ .map(section => section.controlSetRows)
+ .flat(2)
+ .find(
+ control =>
+ controlKey === control ||
+ (control !== null &&
+ typeof control === 'object' &&
+ control.name === controlKey),
+ ) ?? null
+ );
}
export const getControlConfig = memoizeOne(function getControlConfig(
diff --git a/superset-frontend/src/explore/controls.jsx b/superset-frontend/src/explore/controls.jsx
index 7b71015ef1580..1c77938671589 100644
--- a/superset-frontend/src/explore/controls.jsx
+++ b/superset-frontend/src/explore/controls.jsx
@@ -501,4 +501,3 @@ export const controls = {
}),
},
};
-export default controls;
diff --git a/superset-frontend/src/explore/store.js b/superset-frontend/src/explore/store.js
index 3ab2b07167aa6..083ed5866fee7 100644
--- a/superset-frontend/src/explore/store.js
+++ b/superset-frontend/src/explore/store.js
@@ -19,7 +19,7 @@
/* eslint camelcase: 0 */
import { getChartControlPanelRegistry } from '@superset-ui/core';
import { getAllControlsState, getFormDataFromControls } from './controlUtils';
-import controls from './controls';
+import { controls } from './controls';
function handleDeprecatedControls(formData) {
// Reacffectation / handling of deprecated controls
diff --git a/superset-frontend/src/featureFlags.ts b/superset-frontend/src/featureFlags.ts
index db6434aa1d105..3b9acb1bfa7e1 100644
--- a/superset-frontend/src/featureFlags.ts
+++ b/superset-frontend/src/featureFlags.ts
@@ -38,6 +38,8 @@ export type FeatureFlagMap = {
declare global {
interface Window {
featureFlags: FeatureFlagMap;
+ $: any;
+ jQuery: any;
}
}
diff --git a/superset-frontend/src/modules/AnnotationTypes.js b/superset-frontend/src/modules/AnnotationTypes.js
index 99c639c538c97..5741788a6a60c 100644
--- a/superset-frontend/src/modules/AnnotationTypes.js
+++ b/superset-frontend/src/modules/AnnotationTypes.js
@@ -77,5 +77,3 @@ export function applyNativeColumns(annotation) {
}
return annotation;
}
-
-export default ANNOTATION_TYPES;
diff --git a/superset-frontend/src/setup/setupApp.ts b/superset-frontend/src/setup/setupApp.ts
index c51b42a508884..1eef937bc7d73 100644
--- a/superset-frontend/src/setup/setupApp.ts
+++ b/superset-frontend/src/setup/setupApp.ts
@@ -82,9 +82,7 @@ export default function setupApp() {
// A set of hacks to allow apps to run within a FAB template
// this allows for the server side generated menus to function
- // @ts-ignore
window.$ = $;
- // @ts-ignore
window.jQuery = $;
require('bootstrap');
diff --git a/superset-frontend/src/utils/common.js b/superset-frontend/src/utils/common.js
index 39a023bbc3cd2..033382294eb3e 100644
--- a/superset-frontend/src/utils/common.js
+++ b/superset-frontend/src/utils/common.js
@@ -82,14 +82,6 @@ export function getShortUrl(longUrl) {
);
}
-export function supersetURL(rootUrl, getParams = {}) {
- const url = new URL(rootUrl, window.location.origin);
- for (const k in getParams) {
- url.searchParams.set(k, getParams[k]);
- }
- return url.href;
-}
-
export function optionLabel(opt) {
if (opt === null) {
return NULL_STRING;
diff --git a/superset-frontend/src/utils/getControlsForVizType.js b/superset-frontend/src/utils/getControlsForVizType.js
index 0dac5be088726..ec6930f0706ba 100644
--- a/superset-frontend/src/utils/getControlsForVizType.js
+++ b/superset-frontend/src/utils/getControlsForVizType.js
@@ -19,7 +19,7 @@
import memoize from 'lodash/memoize';
import { getChartControlPanelRegistry } from '@superset-ui/core';
-import controls from '../explore/controls';
+import { controls } from '../explore/controls';
const getControlsForVizType = memoize(vizType => {
const controlsMap = {};
diff --git a/superset-frontend/src/views/CRUD/welcome/Welcome.tsx b/superset-frontend/src/views/CRUD/welcome/Welcome.tsx
index 68f6d10c6f32f..256fe3a9e4fa3 100644
--- a/superset-frontend/src/views/CRUD/welcome/Welcome.tsx
+++ b/superset-frontend/src/views/CRUD/welcome/Welcome.tsx
@@ -16,8 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-import React, { useState } from 'react';
-import { Panel, Row, Col, Tabs, Tab, FormControl } from 'react-bootstrap';
+import React, { useCallback, useState } from 'react';
+import {
+ Panel,
+ Row,
+ Col,
+ Tabs,
+ Tab,
+ FormControl,
+ FormControlProps,
+} from 'react-bootstrap';
import { t } from '@superset-ui/core';
import { useQueryParam, StringParam, QueryParamConfig } from 'use-query-params';
import { User } from 'src/types/bootstrapTypes';
@@ -61,12 +69,23 @@ export default function Welcome({ user }: WelcomeProps) {
'',
);
+ const onFormControlChange = useCallback(
+ (e: React.FormEvent
+
+ {% endblock %}
diff --git a/superset/utils/core.py b/superset/utils/core.py
index 5ccb74aa99fa1..bfd9742c846ed 100644
--- a/superset/utils/core.py
+++ b/superset/utils/core.py
@@ -1040,24 +1040,7 @@ def backend() -> str:
def is_adhoc_metric(metric: Metric) -> bool:
- if not isinstance(metric, dict):
- return False
- metric = cast(Dict[str, Any], metric)
- return bool(
- (
- (
- metric.get("expressionType") == AdhocMetricExpressionType.SIMPLE
- and metric.get("column")
- and cast(Dict[str, Any], metric["column"]).get("column_name")
- and metric.get("aggregate")
- )
- or (
- metric.get("expressionType") == AdhocMetricExpressionType.SQL
- and metric.get("sqlExpression")
- )
- )
- and metric.get("label")
- )
+ return isinstance(metric, dict)
def get_metric_name(metric: Metric) -> str:
@@ -1564,3 +1547,8 @@ class PostProcessingContributionOrientation(str, Enum):
class AdhocMetricExpressionType(str, Enum):
SIMPLE = "SIMPLE"
SQL = "SQL"
+
+
+class RowLevelSecurityFilterType(str, Enum):
+ REGULAR = "Regular"
+ BASE = "Base"
diff --git a/tests/alerts_tests.py b/tests/alerts_tests.py
index 81c94b00bfcd9..b09ac930e7172 100644
--- a/tests/alerts_tests.py
+++ b/tests/alerts_tests.py
@@ -128,11 +128,11 @@ def test_alert_observer(setup_database):
assert alert3.sql_observer[0].observations[-1].value is None
assert alert3.sql_observer[0].observations[-1].error_msg is None
- # Test SQLObserver with empty SQL return
+ # Test SQLObserver with empty SQL return, expected
alert4 = create_alert(dbsession, "SELECT first FROM test_table WHERE first = -1")
observe(alert4.id, dbsession)
assert alert4.sql_observer[0].observations[-1].value is None
- assert alert4.sql_observer[0].observations[-1].error_msg is not None
+ assert alert4.sql_observer[0].observations[-1].error_msg is None
# Test SQLObserver with str result
alert5 = create_alert(dbsession, "SELECT 'test_string' as string_value")
diff --git a/tests/db_engine_specs/presto_tests.py b/tests/db_engine_specs/presto_tests.py
index 3a0346bfe2591..7045fc34ecb05 100644
--- a/tests/db_engine_specs/presto_tests.py
+++ b/tests/db_engine_specs/presto_tests.py
@@ -511,3 +511,6 @@ def test_get_sqla_column_type(self):
sqla_type = PrestoEngineSpec.get_sqla_column_type("integer")
assert isinstance(sqla_type, types.Integer)
+
+ sqla_type = PrestoEngineSpec.get_sqla_column_type(None)
+ assert sqla_type is None
diff --git a/tests/schedules_test.py b/tests/schedules_test.py
index 88b6d1f924d1f..b18007e2f77a3 100644
--- a/tests/schedules_test.py
+++ b/tests/schedules_test.py
@@ -171,7 +171,7 @@ def test_create_driver(self, mock_driver_class):
mock_driver_class.return_value = mock_driver
mock_driver.find_elements_by_id.side_effect = [True, False]
- create_webdriver()
+ create_webdriver(db.session)
mock_driver.add_cookie.assert_called_once()
@patch("superset.tasks.schedules.firefox.webdriver.WebDriver")
diff --git a/tests/security_tests.py b/tests/security_tests.py
index fdb6be7c33491..29926a7ee9610 100644
--- a/tests/security_tests.py
+++ b/tests/security_tests.py
@@ -16,6 +16,7 @@
# under the License.
# isort:skip_file
import inspect
+import re
import unittest
from unittest.mock import Mock, patch
@@ -1015,70 +1016,116 @@ class TestRowLevelSecurity(SupersetTestCase):
"""
rls_entry = None
+ query_obj = dict(
+ groupby=[],
+ metrics=[],
+ filter=[],
+ is_timeseries=False,
+ columns=["value"],
+ granularity=None,
+ from_dttm=None,
+ to_dttm=None,
+ extras={},
+ )
+ NAME_AB_ROLE = "NameAB"
+ NAME_Q_ROLE = "NameQ"
+ NAMES_A_REGEX = re.compile(r"name like 'A%'")
+ NAMES_B_REGEX = re.compile(r"name like 'B%'")
+ NAMES_Q_REGEX = re.compile(r"name like 'Q%'")
+ BASE_FILTER_REGEX = re.compile(r"gender = 'boy'")
def setUp(self):
session = db.session
- # Create the RowLevelSecurityFilter
- self.rls_entry = RowLevelSecurityFilter()
- self.rls_entry.tables.extend(
+ # Create roles
+ security_manager.add_role(self.NAME_AB_ROLE)
+ security_manager.add_role(self.NAME_Q_ROLE)
+ gamma_user = security_manager.find_user(username="gamma")
+ gamma_user.roles.append(security_manager.find_role(self.NAME_AB_ROLE))
+ gamma_user.roles.append(security_manager.find_role(self.NAME_Q_ROLE))
+ self.create_user_with_roles("NoRlsRoleUser", ["Gamma"])
+ session.commit()
+
+ # Create regular RowLevelSecurityFilter (energy_usage, unicode_test)
+ self.rls_entry1 = RowLevelSecurityFilter()
+ self.rls_entry1.tables.extend(
session.query(SqlaTable)
.filter(SqlaTable.table_name.in_(["energy_usage", "unicode_test"]))
.all()
)
- self.rls_entry.clause = "value > {{ cache_key_wrapper(1) }}"
- self.rls_entry.roles.append(
- security_manager.find_role("Gamma")
- ) # db.session.query(Role).filter_by(name="Gamma").first())
- self.rls_entry.roles.append(security_manager.find_role("Alpha"))
- db.session.add(self.rls_entry)
+ self.rls_entry1.filter_type = "Regular"
+ self.rls_entry1.clause = "value > {{ cache_key_wrapper(1) }}"
+ self.rls_entry1.group_key = None
+ self.rls_entry1.roles.append(security_manager.find_role("Gamma"))
+ self.rls_entry1.roles.append(security_manager.find_role("Alpha"))
+ db.session.add(self.rls_entry1)
+
+ # Create regular RowLevelSecurityFilter (birth_names name starts with A or B)
+ self.rls_entry2 = RowLevelSecurityFilter()
+ self.rls_entry2.tables.extend(
+ session.query(SqlaTable)
+ .filter(SqlaTable.table_name.in_(["birth_names"]))
+ .all()
+ )
+ self.rls_entry2.filter_type = "Regular"
+ self.rls_entry2.clause = "name like 'A%' or name like 'B%'"
+ self.rls_entry2.group_key = "name"
+ self.rls_entry2.roles.append(security_manager.find_role("NameAB"))
+ db.session.add(self.rls_entry2)
+
+ # Create Regular RowLevelSecurityFilter (birth_names name starts with Q)
+ self.rls_entry3 = RowLevelSecurityFilter()
+ self.rls_entry3.tables.extend(
+ session.query(SqlaTable)
+ .filter(SqlaTable.table_name.in_(["birth_names"]))
+ .all()
+ )
+ self.rls_entry3.filter_type = "Regular"
+ self.rls_entry3.clause = "name like 'Q%'"
+ self.rls_entry3.group_key = "name"
+ self.rls_entry3.roles.append(security_manager.find_role("NameQ"))
+ db.session.add(self.rls_entry3)
+
+ # Create Base RowLevelSecurityFilter (birth_names boys)
+ self.rls_entry4 = RowLevelSecurityFilter()
+ self.rls_entry4.tables.extend(
+ session.query(SqlaTable)
+ .filter(SqlaTable.table_name.in_(["birth_names"]))
+ .all()
+ )
+ self.rls_entry4.filter_type = "Base"
+ self.rls_entry4.clause = "gender = 'boy'"
+ self.rls_entry4.group_key = "gender"
+ self.rls_entry4.roles.append(security_manager.find_role("Admin"))
+ db.session.add(self.rls_entry4)
db.session.commit()
def tearDown(self):
session = db.session
- session.delete(self.rls_entry)
+ session.delete(self.rls_entry1)
+ session.delete(self.rls_entry2)
+ session.delete(self.rls_entry3)
+ session.delete(self.rls_entry4)
+ session.delete(security_manager.find_role("NameAB"))
+ session.delete(security_manager.find_role("NameQ"))
+ session.delete(self.get_user("NoRlsRoleUser"))
session.commit()
- # Do another test to make sure it doesn't alter another query
- def test_rls_filter_alters_query(self):
- g.user = self.get_user(
- username="alpha"
- ) # self.login() doesn't actually set the user
+ def test_rls_filter_alters_energy_query(self):
+ g.user = self.get_user(username="alpha")
tbl = self.get_table_by_name("energy_usage")
- query_obj = dict(
- groupby=[],
- metrics=[],
- filter=[],
- is_timeseries=False,
- columns=["value"],
- granularity=None,
- from_dttm=None,
- to_dttm=None,
- extras={},
- )
- sql = tbl.get_query_str(query_obj)
- assert tbl.get_extra_cache_keys(query_obj) == [1]
+ sql = tbl.get_query_str(self.query_obj)
+ assert tbl.get_extra_cache_keys(self.query_obj) == [1]
assert "value > 1" in sql
- def test_rls_filter_doesnt_alter_query(self):
+ def test_rls_filter_doesnt_alter_energy_query(self):
g.user = self.get_user(
username="admin"
) # self.login() doesn't actually set the user
tbl = self.get_table_by_name("energy_usage")
- query_obj = dict(
- groupby=[],
- metrics=[],
- filter=[],
- is_timeseries=False,
- columns=["value"],
- granularity=None,
- from_dttm=None,
- to_dttm=None,
- extras={},
- )
- sql = tbl.get_query_str(query_obj)
- assert tbl.get_extra_cache_keys(query_obj) == []
+ sql = tbl.get_query_str(self.query_obj)
+ assert tbl.get_extra_cache_keys(self.query_obj) == []
assert "value > 1" not in sql
def test_multiple_table_filter_alters_another_tables_query(self):
@@ -1086,17 +1133,41 @@ def test_multiple_table_filter_alters_another_tables_query(self):
username="alpha"
) # self.login() doesn't actually set the user
tbl = self.get_table_by_name("unicode_test")
- query_obj = dict(
- groupby=[],
- metrics=[],
- filter=[],
- is_timeseries=False,
- columns=["value"],
- granularity=None,
- from_dttm=None,
- to_dttm=None,
- extras={},
- )
- sql = tbl.get_query_str(query_obj)
- assert tbl.get_extra_cache_keys(query_obj) == [1]
+ sql = tbl.get_query_str(self.query_obj)
+ assert tbl.get_extra_cache_keys(self.query_obj) == [1]
assert "value > 1" in sql
+
+ def test_rls_filter_alters_gamma_birth_names_query(self):
+ g.user = self.get_user(username="gamma")
+ tbl = self.get_table_by_name("birth_names")
+ sql = tbl.get_query_str(self.query_obj)
+
+ # establish that the filters are grouped together correctly with
+ # ANDs, ORs and parens in the correct place
+ assert (
+ "WHERE ((name like 'A%'\n or name like 'B%')\n OR (name like 'Q%'))\n AND (gender = 'boy');"
+ in sql
+ )
+
+ def test_rls_filter_alters_no_role_user_birth_names_query(self):
+ g.user = self.get_user(username="NoRlsRoleUser")
+ tbl = self.get_table_by_name("birth_names")
+ sql = tbl.get_query_str(self.query_obj)
+
+ # gamma's filters should not be present query
+ assert not self.NAMES_A_REGEX.search(sql)
+ assert not self.NAMES_B_REGEX.search(sql)
+ assert not self.NAMES_Q_REGEX.search(sql)
+ # base query should be present
+ assert self.BASE_FILTER_REGEX.search(sql)
+
+ def test_rls_filter_doesnt_alter_admin_birth_names_query(self):
+ g.user = self.get_user(username="admin")
+ tbl = self.get_table_by_name("birth_names")
+ sql = tbl.get_query_str(self.query_obj)
+
+ # no filters are applied for admin user
+ assert not self.NAMES_A_REGEX.search(sql)
+ assert not self.NAMES_B_REGEX.search(sql)
+ assert not self.NAMES_Q_REGEX.search(sql)
+ assert not self.BASE_FILTER_REGEX.search(sql)
diff --git a/tests/superset_test_custom_template_processors.py b/tests/superset_test_custom_template_processors.py
index b3534814786a7..124c73931f4e5 100644
--- a/tests/superset_test_custom_template_processors.py
+++ b/tests/superset_test_custom_template_processors.py
@@ -42,7 +42,7 @@ def process_template(self, sql: str, **kwargs) -> str:
# Add custom macros functions.
macros = {"DATE": partial(DATE, datetime.utcnow())} # type: Dict[str, Any]
# Update with macros defined in context and kwargs.
- macros.update(self.context)
+ macros.update(self._context)
macros.update(kwargs)
def replacer(match):
+ {% endblock %}
+
+ {% block begin_loop_header scoped %}
+
+
+
+ {% if actions %}
+
+
+ {% endblock %}
+
+ {% block begin_loop_values %}
+ {% for item in value_columns %}
+ {% set pk = pks[loop.index-1] %}
+
+
+
+ {% endif %}
+
+ {% if can_show or can_edit or can_delete %}
+
+ {% endif %}
+
+ {% for item in include_columns %}
+ {% if item in order_columns %}
+ {% set res = item | get_link_order(modelview_name) %}
+ {% if res == 2 %}
+ {{label_columns.get(item)}}
+
+ {% elif res == 1 %}
+ {{label_columns.get(item)}}
+
+ {% else %}
+ {{label_columns.get(item)}}
+
+ {% endif %}
+ {% else %}
+ {{label_columns.get(item)}}
+ {% endif %}
+ {% endfor %}
+
+ {% if actions %}
+
+ {% endfor %}
+ {% endblock %}
+
+ {% block end_content scoped %}
+
+
+
+ {% endif %}
+ {% if can_show or can_edit or can_delete %}
+
+ {% if value == "roles" and item["filter_type"] == "Base" and not item[value] %}
+ All
+ {% elif value == "roles" and item["filter_type"] == 'Base' %}
+ Not {{ item[value] }}
+ {% elif value == "roles" and item["filter_type"] == 'Regular' and not item[value] %}
+ None
+ {% elif value == "group_key" and item[value] == None %}
+ {% else %}
+ {{ item[value] }}
+ {% endif %}
+
+ {% endfor %}
+
-
-