You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by hu...@apache.org on 2022/12/23 05:33:00 UTC
[superset] 01/01: replace naming convention
This is an automated email from the ASF dual-hosted git repository.
hugh pushed a commit to branch replace-dataset-datasource
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 23db99f099f0343e064021d11f11f2f9d52d2b0c
Author: hughhhh <hu...@gmail.com>
AuthorDate: Fri Dec 23 00:32:32 2022 -0500
replace naming convention
---
.../integration/dashboard/nativeFilters.test.ts | 122 ++++++++++-----------
.../superset-ui-core/src/query/types/Dashboard.ts | 2 +-
.../spec/fixtures/mockNativeFilters.ts | 8 +-
superset-frontend/src/SqlLab/actions/sqlLab.js | 4 +-
.../SqlLab/components/SaveDatasetModal/index.tsx | 14 +--
superset-frontend/src/SqlLab/types.ts | 2 +-
superset-frontend/src/constants.ts | 4 +-
.../nativeFilters/FilterBar/FilterBar.test.tsx | 2 +-
.../FilterBar/FilterControls/FilterValue.tsx | 10 +-
.../nativeFilters/FilterCard/FilterCard.test.tsx | 6 +-
.../FiltersConfigForm/ColumnSelect.test.tsx | 8 +-
.../FiltersConfigForm/ColumnSelect.tsx | 10 +-
.../FiltersConfigForm/FiltersConfigForm.tsx | 26 ++---
.../FiltersConfigForm/getControlItemsMap.test.tsx | 2 +-
.../FiltersConfigForm/getControlItemsMap.tsx | 6 +-
.../nativeFilters/FiltersConfigModal/utils.ts | 2 +-
.../dashboard/components/nativeFilters/utils.ts | 8 +-
.../src/dashboard/fixtures/mockNativeFilters.ts | 2 +-
.../util/filterboxMigrationHelper.test.ts | 4 +-
.../src/dashboard/util/filterboxMigrationHelper.ts | 6 +-
superset-frontend/src/views/routes.tsx | 2 +-
superset/dashboards/commands/export.py | 2 +-
superset/dashboards/commands/importers/v0.py | 4 +-
superset/dashboards/commands/importers/v1/utils.py | 2 +-
superset/explore/permalink/commands/get.py | 2 +-
superset/explore/permalink/types.py | 5 +-
superset/models/dashboard.py | 2 +-
.../explore/permalink/commands_tests.py | 2 +-
...221_migrate_filter_sets_to_new_format__tests.py | 20 ++--
29 files changed, 144 insertions(+), 145 deletions(-)
diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/nativeFilters.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard/nativeFilters.test.ts
index 365a7e4ecb..1fa42d1ea8 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard/nativeFilters.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard/nativeFilters.test.ts
@@ -73,7 +73,7 @@ function visitDashboard(createSample = true) {
}
function prepareDashboardFilters(
- filters: { name: string; column: string; datasetId: number }[],
+ filters: { name: string; column: string; datasourceId: number }[],
) {
cy.createSampleDashboards([0]);
cy.request({
@@ -97,7 +97,7 @@ function prepareDashboardFilters(
filterType: 'filter_select',
targets: [
{
- datasetId: f.datasetId,
+ datasourceId: f.datasourceId,
column: { name: f.column },
},
],
@@ -270,9 +270,9 @@ describe('Horizontal FilterBar', () => {
it('should show all filters in available space on load', () => {
prepareDashboardFilters([
- { name: 'test_1', column: 'country_name', datasetId: 2 },
- { name: 'test_2', column: 'country_code', datasetId: 2 },
- { name: 'test_3', column: 'region', datasetId: 2 },
+ { name: 'test_1', column: 'country_name', datasourceId: 2 },
+ { name: 'test_2', column: 'country_code', datasourceId: 2 },
+ { name: 'test_3', column: 'region', datasourceId: 2 },
]);
setFilterBarOrientation('horizontal');
cy.get('.filter-item-wrapper').should('have.length', 3);
@@ -280,9 +280,9 @@ describe('Horizontal FilterBar', () => {
it('should show "more filters" on window resizing up and down', () => {
prepareDashboardFilters([
- { name: 'test_1', column: 'country_name', datasetId: 2 },
- { name: 'test_2', column: 'country_code', datasetId: 2 },
- { name: 'test_3', column: 'region', datasetId: 2 },
+ { name: 'test_1', column: 'country_name', datasourceId: 2 },
+ { name: 'test_2', column: 'country_code', datasourceId: 2 },
+ { name: 'test_3', column: 'region', datasourceId: 2 },
]);
setFilterBarOrientation('horizontal');
@@ -305,18 +305,18 @@ describe('Horizontal FilterBar', () => {
it('should show "more filters" and scroll', () => {
prepareDashboardFilters([
- { name: 'test_1', column: 'country_name', datasetId: 2 },
- { name: 'test_2', column: 'country_code', datasetId: 2 },
- { name: 'test_3', column: 'region', datasetId: 2 },
- { name: 'test_4', column: 'year', datasetId: 2 },
- { name: 'test_5', column: 'country_name', datasetId: 2 },
- { name: 'test_6', column: 'country_code', datasetId: 2 },
- { name: 'test_7', column: 'region', datasetId: 2 },
- { name: 'test_8', column: 'year', datasetId: 2 },
- { name: 'test_9', column: 'country_name', datasetId: 2 },
- { name: 'test_10', column: 'country_code', datasetId: 2 },
- { name: 'test_11', column: 'region', datasetId: 2 },
- { name: 'test_12', column: 'year', datasetId: 2 },
+ { name: 'test_1', column: 'country_name', datasourceId: 2 },
+ { name: 'test_2', column: 'country_code', datasourceId: 2 },
+ { name: 'test_3', column: 'region', datasourceId: 2 },
+ { name: 'test_4', column: 'year', datasourceId: 2 },
+ { name: 'test_5', column: 'country_name', datasourceId: 2 },
+ { name: 'test_6', column: 'country_code', datasourceId: 2 },
+ { name: 'test_7', column: 'region', datasourceId: 2 },
+ { name: 'test_8', column: 'year', datasourceId: 2 },
+ { name: 'test_9', column: 'country_name', datasourceId: 2 },
+ { name: 'test_10', column: 'country_code', datasourceId: 2 },
+ { name: 'test_11', column: 'region', datasourceId: 2 },
+ { name: 'test_12', column: 'year', datasourceId: 2 },
]);
setFilterBarOrientation('horizontal');
cy.get('.filter-item-wrapper').should('have.length', 3);
@@ -344,18 +344,18 @@ describe('Horizontal FilterBar', () => {
it('should spot changes in "more filters" and apply their values', () => {
cy.intercept(`/api/v1/chart/data?form_data=**`).as('chart');
prepareDashboardFilters([
- { name: 'test_1', column: 'country_name', datasetId: 2 },
- { name: 'test_2', column: 'country_code', datasetId: 2 },
- { name: 'test_3', column: 'region', datasetId: 2 },
- { name: 'test_4', column: 'year', datasetId: 2 },
- { name: 'test_5', column: 'country_name', datasetId: 2 },
- { name: 'test_6', column: 'country_code', datasetId: 2 },
- { name: 'test_7', column: 'region', datasetId: 2 },
- { name: 'test_8', column: 'year', datasetId: 2 },
- { name: 'test_9', column: 'country_name', datasetId: 2 },
- { name: 'test_10', column: 'country_code', datasetId: 2 },
- { name: 'test_11', column: 'region', datasetId: 2 },
- { name: 'test_12', column: 'year', datasetId: 2 },
+ { name: 'test_1', column: 'country_name', datasourceId: 2 },
+ { name: 'test_2', column: 'country_code', datasourceId: 2 },
+ { name: 'test_3', column: 'region', datasourceId: 2 },
+ { name: 'test_4', column: 'year', datasourceId: 2 },
+ { name: 'test_5', column: 'country_name', datasourceId: 2 },
+ { name: 'test_6', column: 'country_code', datasourceId: 2 },
+ { name: 'test_7', column: 'region', datasourceId: 2 },
+ { name: 'test_8', column: 'year', datasourceId: 2 },
+ { name: 'test_9', column: 'country_name', datasourceId: 2 },
+ { name: 'test_10', column: 'country_code', datasourceId: 2 },
+ { name: 'test_11', column: 'region', datasourceId: 2 },
+ { name: 'test_12', column: 'year', datasourceId: 2 },
]);
setFilterBarOrientation('horizontal');
openMoreFilters();
@@ -371,18 +371,18 @@ describe('Horizontal FilterBar', () => {
it('should focus filter and open "more filters" programmatically', () => {
prepareDashboardFilters([
- { name: 'test_1', column: 'country_name', datasetId: 2 },
- { name: 'test_2', column: 'country_code', datasetId: 2 },
- { name: 'test_3', column: 'region', datasetId: 2 },
- { name: 'test_4', column: 'year', datasetId: 2 },
- { name: 'test_5', column: 'country_name', datasetId: 2 },
- { name: 'test_6', column: 'country_code', datasetId: 2 },
- { name: 'test_7', column: 'region', datasetId: 2 },
- { name: 'test_8', column: 'year', datasetId: 2 },
- { name: 'test_9', column: 'country_name', datasetId: 2 },
- { name: 'test_10', column: 'country_code', datasetId: 2 },
- { name: 'test_11', column: 'region', datasetId: 2 },
- { name: 'test_12', column: 'year', datasetId: 2 },
+ { name: 'test_1', column: 'country_name', datasourceId: 2 },
+ { name: 'test_2', column: 'country_code', datasourceId: 2 },
+ { name: 'test_3', column: 'region', datasourceId: 2 },
+ { name: 'test_4', column: 'year', datasourceId: 2 },
+ { name: 'test_5', column: 'country_name', datasourceId: 2 },
+ { name: 'test_6', column: 'country_code', datasourceId: 2 },
+ { name: 'test_7', column: 'region', datasourceId: 2 },
+ { name: 'test_8', column: 'year', datasourceId: 2 },
+ { name: 'test_9', column: 'country_name', datasourceId: 2 },
+ { name: 'test_10', column: 'country_code', datasourceId: 2 },
+ { name: 'test_11', column: 'region', datasourceId: 2 },
+ { name: 'test_12', column: 'year', datasourceId: 2 },
]);
setFilterBarOrientation('horizontal');
cy.getBySel('slice-header').within(() => {
@@ -395,7 +395,7 @@ describe('Horizontal FilterBar', () => {
it('should show tag count and one plain tag on focus and only count on blur in select ', () => {
prepareDashboardFilters([
- { name: 'test_1', column: 'country_name', datasetId: 2 },
+ { name: 'test_1', column: 'country_name', datasourceId: 2 },
]);
setFilterBarOrientation('horizontal');
enterNativeFilterEditModal();
@@ -423,7 +423,7 @@ describe('Native filters', () => {
it('Verify that default value is respected after revisit', () => {
prepareDashboardFilters([
- { name: 'country_name', column: 'country_name', datasetId: 2 },
+ { name: 'country_name', column: 'country_name', datasourceId: 2 },
]);
enterNativeFilterEditModal();
inputNativeFilterDefaultValue(testItems.filterDefaultValue);
@@ -447,8 +447,8 @@ describe('Native filters', () => {
it('User can create parent filters using "Values are dependent on other filters"', () => {
prepareDashboardFilters([
- { name: 'region', column: 'region', datasetId: 2 },
- { name: 'country_name', column: 'country_name', datasetId: 2 },
+ { name: 'region', column: 'region', datasourceId: 2 },
+ { name: 'country_name', column: 'country_name', datasourceId: 2 },
]);
enterNativeFilterEditModal();
selectFilter(1);
@@ -481,8 +481,8 @@ describe('Native filters', () => {
it('user can delete dependent filter', () => {
prepareDashboardFilters([
- { name: 'region', column: 'region', datasetId: 2 },
- { name: 'country_name', column: 'country_name', datasetId: 2 },
+ { name: 'region', column: 'region', datasourceId: 2 },
+ { name: 'country_name', column: 'country_name', datasourceId: 2 },
]);
enterNativeFilterEditModal();
selectFilter(1);
@@ -517,9 +517,9 @@ describe('Native filters', () => {
it('User can create filter depend on 2 other filters', () => {
prepareDashboardFilters([
- { name: 'region', column: 'region', datasetId: 2 },
- { name: 'country_name', column: 'country_name', datasetId: 2 },
- { name: 'country_code', column: 'country_code', datasetId: 2 },
+ { name: 'region', column: 'region', datasourceId: 2 },
+ { name: 'country_name', column: 'country_name', datasourceId: 2 },
+ { name: 'country_code', column: 'country_code', datasourceId: 2 },
]);
enterNativeFilterEditModal();
selectFilter(2);
@@ -570,8 +570,8 @@ describe('Native filters', () => {
it('User can remove parent filters', () => {
prepareDashboardFilters([
- { name: 'region', column: 'region', datasetId: 2 },
- { name: 'country_name', column: 'country_name', datasetId: 2 },
+ { name: 'region', column: 'region', datasourceId: 2 },
+ { name: 'country_name', column: 'country_name', datasourceId: 2 },
]);
enterNativeFilterEditModal();
selectFilter(1);
@@ -660,7 +660,7 @@ describe('Native filters', () => {
describe('Nativefilters initial state not required', () => {
it("User can check 'Filter has default value'", () => {
prepareDashboardFilters([
- { name: 'country_name', column: 'country_name', datasetId: 2 },
+ { name: 'country_name', column: 'country_name', datasourceId: 2 },
]);
enterNativeFilterEditModal();
inputNativeFilterDefaultValue(testItems.filterDefaultValue);
@@ -693,7 +693,7 @@ describe('Native filters', () => {
it('User can restore a deleted native filter', () => {
prepareDashboardFilters([
- { name: 'country_code', column: 'country_code', datasetId: 2 },
+ { name: 'country_code', column: 'country_code', datasourceId: 2 },
]);
enterNativeFilterEditModal();
cy.get(nativeFilters.filtersList.removeIcon).first().click();
@@ -802,7 +802,7 @@ describe('Native filters', () => {
it('User can undo deleting a native filter', () => {
prepareDashboardFilters([
- { name: 'country_name', column: 'country_name', datasetId: 2 },
+ { name: 'country_name', column: 'country_name', datasourceId: 2 },
]);
enterNativeFilterEditModal();
undoDeleteNativeFilter();
@@ -813,7 +813,7 @@ describe('Native filters', () => {
it('User can cancel changes in native filter', () => {
prepareDashboardFilters([
- { name: 'country_name', column: 'country_name', datasetId: 2 },
+ { name: 'country_name', column: 'country_name', datasourceId: 2 },
]);
enterNativeFilterEditModal();
cy.getBySel('filters-config-modal__name-input').type('|EDITED', {
@@ -838,7 +838,7 @@ describe('Native filters', () => {
it('User can apply value filter with selected values', () => {
prepareDashboardFilters([
- { name: 'country_name', column: 'country_name', datasetId: 2 },
+ { name: 'country_name', column: 'country_name', datasourceId: 2 },
]);
applyNativeFilterValueWithIndex(0, testItems.filterDefaultValue);
cy.get(nativeFilters.applyFilter).click();
@@ -850,7 +850,7 @@ describe('Native filters', () => {
it('User can stop filtering when filter is removed', () => {
prepareDashboardFilters([
- { name: 'country_name', column: 'country_name', datasetId: 2 },
+ { name: 'country_name', column: 'country_name', datasourceId: 2 },
]);
enterNativeFilterEditModal();
inputNativeFilterDefaultValue(testItems.filterDefaultValue);
diff --git a/superset-frontend/packages/superset-ui-core/src/query/types/Dashboard.ts b/superset-frontend/packages/superset-ui-core/src/query/types/Dashboard.ts
index b916e27a39..8cc1297ff1 100644
--- a/superset-frontend/packages/superset-ui-core/src/query/types/Dashboard.ts
+++ b/superset-frontend/packages/superset-ui-core/src/query/types/Dashboard.ts
@@ -31,7 +31,7 @@ export interface NativeFilterScope {
/** The target of a filter is the datasource/column being filtered */
export interface NativeFilterTarget {
- datasetId: number;
+ datasourceId: number;
column: NativeFilterColumn;
// maybe someday support this?
diff --git a/superset-frontend/spec/fixtures/mockNativeFilters.ts b/superset-frontend/spec/fixtures/mockNativeFilters.ts
index dea5cfb8fd..a70dec0f5b 100644
--- a/superset-frontend/spec/fixtures/mockNativeFilters.ts
+++ b/superset-frontend/spec/fixtures/mockNativeFilters.ts
@@ -32,7 +32,7 @@ export const nativeFilters: NativeFiltersState = {
filterType: 'filter_select',
targets: [
{
- datasetId: 2,
+ datasourceId: 2,
column: {
name: 'region',
},
@@ -63,7 +63,7 @@ export const nativeFilters: NativeFiltersState = {
filterType: 'filter_select',
targets: [
{
- datasetId: 2,
+ datasourceId: 2,
column: {
name: 'country_code',
},
@@ -134,7 +134,7 @@ export const singleNativeFiltersState = {
id: [NATIVE_FILTER_ID],
name: 'eth',
type: 'text',
- targets: [{ datasetId: 13, column: { name: 'ethnic_minority' } }],
+ targets: [{ datasourceId: 13, column: { name: 'ethnic_minority' } }],
defaultDataMask: {
filterState: {
value: null,
@@ -473,7 +473,7 @@ export const buildNativeFilter = (
filterType: 'filter_select',
targets: [
{
- datasetId: 1,
+ datasourceId: 1,
column: {
name,
},
diff --git a/superset-frontend/src/SqlLab/actions/sqlLab.js b/superset-frontend/src/SqlLab/actions/sqlLab.js
index a58630cda1..09d1e7592e 100644
--- a/superset-frontend/src/SqlLab/actions/sqlLab.js
+++ b/superset-frontend/src/SqlLab/actions/sqlLab.js
@@ -1410,9 +1410,9 @@ export function popQuery(queryId) {
}
export function popDatasourceQuery(datasourceKey, sql) {
return function (dispatch) {
- const datasetId = datasourceKey.split('__')[0];
+ const datasourceId = datasourceKey.split('__')[0];
return SupersetClient.get({
- endpoint: `/api/v1/dataset/${datasetId}?q=(keys:!(none))`,
+ endpoint: `/api/v1/dataset/${datasourceId}?q=(keys:!(none))`,
})
.then(({ json }) =>
dispatch(
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx
index 10c1aaf414..f7921e2bc3 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx
@@ -122,13 +122,13 @@ const Styles = styled.div`
const updateDataset = async (
dbId: number,
- datasetId: number,
+ datasourceId: number,
sql: string,
columns: Array<Record<string, any>>,
owners: [number],
overrideColumns: boolean,
) => {
- const endpoint = `api/v1/dataset/${datasetId}?override_columns=${overrideColumns}`;
+ const endpoint = `api/v1/dataset/${datasourceId}?override_columns=${overrideColumns}`;
const headers = { 'Content-Type': 'application/json' };
const body = JSON.stringify({
sql,
@@ -200,7 +200,7 @@ export const SaveDatasetModal = ({
const [, key] = await Promise.all([
updateDataset(
datasource?.dbId,
- datasetToOverwrite?.datasetid,
+ datasetToOverwrite?.datasourceId,
datasource?.sql,
datasource?.columns?.map(
(d: { name: string; type: string; is_dttm: boolean }) => ({
@@ -212,9 +212,9 @@ export const SaveDatasetModal = ({
datasetToOverwrite?.owners?.map((o: DatasetOwner) => o.id),
true,
),
- postFormData(datasetToOverwrite.datasetid, 'table', {
+ postFormData(datasetToOverwrite.datasourceId, 'table', {
...formDataWithDefaults,
- datasource: `${datasetToOverwrite.datasetid}__table`,
+ datasource: `${datasetToOverwrite.datasourceId}__table`,
...(defaultVizType === 'table' && {
all_columns: datasource?.columns?.map(column => column.name),
}),
@@ -258,7 +258,7 @@ export const SaveDatasetModal = ({
(r: { table_name: string; id: number; owners: [DatasetOwner] }) => ({
value: r.table_name,
label: r.table_name,
- datasetid: r.id,
+ datasourceId: r.id,
owners: r.owners,
}),
),
@@ -341,7 +341,7 @@ export const SaveDatasetModal = ({
const filterAutocompleteOption = (
inputValue: string,
- option: { value: string; datasetid: number },
+ option: { value: string; datasourceId: number },
) => option.value.toLowerCase().includes(inputValue.toLowerCase());
return (
diff --git a/superset-frontend/src/SqlLab/types.ts b/superset-frontend/src/SqlLab/types.ts
index 7317ef0789..8804a8c14a 100644
--- a/superset-frontend/src/SqlLab/types.ts
+++ b/superset-frontend/src/SqlLab/types.ts
@@ -122,7 +122,7 @@ export interface DatasetOwner {
export interface DatasetOptionAutocomplete {
value: string;
- datasetId: number;
+ datasourceId: number;
owners: [DatasetOwner];
}
diff --git a/superset-frontend/src/constants.ts b/superset-frontend/src/constants.ts
index dcef70da7e..be4ae1f3dc 100644
--- a/superset-frontend/src/constants.ts
+++ b/superset-frontend/src/constants.ts
@@ -73,7 +73,7 @@ export const URL_PARAMS = {
name: 'datasource_id',
type: 'string',
},
- datasetId: {
+ datasourceId: {
name: 'dataset_id',
type: 'string',
},
@@ -120,7 +120,7 @@ export const RESERVED_CHART_URL_PARAMS: string[] = [
URL_PARAMS.sliceId.name,
URL_PARAMS.datasourceId.name,
URL_PARAMS.datasourceType.name,
- URL_PARAMS.datasetId.name,
+ URL_PARAMS.datasourceId.name,
];
export const RESERVED_DASHBOARD_URL_PARAMS: string[] = [
URL_PARAMS.nativeFilters.name,
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.test.tsx
index 7a8106ecbe..aa631bf865 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.test.tsx
@@ -146,7 +146,7 @@ describe('FilterBar', () => {
"id":"${filterId}",
"name":"${FILTER_NAME}",
"filterType":"filter_time",
- "targets":[{"datasetId":11,"column":{"name":"color"}}],
+ "targets":[{"datasourceId":11,"column":{"name":"color"}}],
"defaultDataMask":{"filterState":{"value":null}},
"controlValues":{},
"cascadeParentIds":[],
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx
index 308361622e..c51717c170 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx
@@ -102,11 +102,11 @@ const FilterValue: React.FC<FilterControlProps> = ({
const inputRef = useRef<HTMLInputElement>(null);
const [target] = targets;
const {
- datasetId,
+ datasourceId,
column = {},
- }: Partial<{ datasetId: number; column: { name?: string } }> = target;
+ }: Partial<{ datasourceId: number; column: { name?: string } }> = target;
const { name: groupby } = column;
- const hasDataSource = !!datasetId;
+ const hasDataSource = !!datasourceId;
const [isLoading, setIsLoading] = useState<boolean>(hasDataSource);
const [isRefreshing, setIsRefreshing] = useState(false);
const dispatch = useDispatch();
@@ -131,7 +131,7 @@ const FilterValue: React.FC<FilterControlProps> = ({
}
const newFormData = getFormData({
...filter,
- datasetId,
+ datasourceId,
dependencies,
groupby,
adhoc_filters,
@@ -202,7 +202,7 @@ const FilterValue: React.FC<FilterControlProps> = ({
}, [
inViewFirstTime,
dependencies,
- datasetId,
+ datasourceId,
groupby,
handleFilterLoadFinish,
JSON.stringify(filter),
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/FilterCard.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/FilterCard.test.tsx
index 560fa1faf0..99c66fb060 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/FilterCard.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/FilterCard.test.tsx
@@ -37,7 +37,7 @@ const baseInitialState = {
filterType: 'filter_select',
targets: [
{
- datasetId: 1,
+ datasourceId: 1,
column: {
name: 'gender',
},
@@ -59,7 +59,7 @@ const baseInitialState = {
filterType: 'filter_select',
targets: [
{
- datasetId: 1,
+ datasourceId: 1,
column: {
name: 'gender',
},
@@ -176,7 +176,7 @@ const baseFilter: Filter = {
filterType: 'filter_select',
targets: [
{
- datasetId: 1,
+ datasourceId: 1,
column: {
name: 'gender',
},
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.test.tsx
index 424b16835d..0d5064e3d9 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.test.tsx
@@ -52,7 +52,7 @@ fetchMock.get('glob:*/api/v1/dataset/789', { status: 404 });
const createProps = (extraProps: JsonObject = {}) => ({
filterId: 'filterId',
form: { getFieldValue: jest.fn(), setFields: jest.fn() },
- datasetId: 123,
+ datasourceId: 123,
value: 'column_name_01',
onChange: jest.fn(),
...extraProps,
@@ -80,14 +80,14 @@ test('Should render', async () => {
});
});
-test('Should call "setFields" when "datasetId" changes', () => {
+test('Should call "setFields" when "datasourceId" changes', () => {
const props = createProps();
const { rerender } = render(<ColumnSelect {...(props as any)} />, {
useRedux: true,
});
expect(props.form.setFields).not.toBeCalled();
- props.datasetId = 456;
+ props.datasourceId = 456;
rerender(<ColumnSelect {...(props as any)} />);
expect(props.form.setFields).toBeCalled();
@@ -96,7 +96,7 @@ test('Should call "setFields" when "datasetId" changes', () => {
test('Should call "getClientErrorObject" when api returns an error', async () => {
const props = createProps();
- props.datasetId = 789;
+ props.datasourceId = 789;
const spy = jest.spyOn(utils, 'getClientErrorObject');
expect(spy).not.toBeCalled();
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.tsx
index 41c591ade3..acf59dfdb1 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/ColumnSelect.tsx
@@ -32,7 +32,7 @@ interface ColumnSelectProps {
form: FormInstance<NativeFiltersForm>;
formField?: string;
filterId: string;
- datasetId?: number;
+ datasourceId?: number;
value?: string | string[];
onChange?: (value: string) => void;
mode?: 'multiple';
@@ -54,7 +54,7 @@ export function ColumnSelect({
form,
formField = 'column',
filterId,
- datasetId,
+ datasourceId,
value,
onChange,
mode,
@@ -92,13 +92,13 @@ export function ColumnSelect({
}
}, [currentColumn, currentFilterType, resetColumnField]);
- useChangeEffect(datasetId, previous => {
+ useChangeEffect(datasourceId, previous => {
if (previous != null) {
resetColumnField();
}
- if (datasetId != null) {
+ if (datasourceId != null) {
cachedSupersetGet({
- endpoint: `/api/v1/dataset/${datasetId}`,
+ endpoint: `/api/v1/dataset/${datasourceId}`,
}).then(
({ json: { result } }) => {
const lookupValue = Array.isArray(value) ? value : [value];
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
index d70679128e..50732113d2 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
@@ -391,14 +391,14 @@ const FiltersConfigForm = (
// @ts-ignore
!!nativeFilterItems[formFilter?.filterType]?.value?.datasourceCount;
- const datasetId =
+ const datasourceId =
formFilter?.dataset?.value ??
- filterToEdit?.targets[0]?.datasetId ??
+ filterToEdit?.targets[0]?.datasourceId ??
mostUsedDataset(loadedDatasets, charts);
const { controlItems = {}, mainControlItems = {} } = formFilter
? getControlItemsMap({
- datasetId,
+ datasourceId,
disabled: false,
forceUpdate,
form,
@@ -418,7 +418,7 @@ const FiltersConfigForm = (
const hasMetrics = hasColumn && !!metrics.length;
const hasFilledDataset =
- !hasDataset || (datasetId && (formFilter?.column || !hasColumn));
+ !hasDataset || (datasourceId && (formFilter?.column || !hasColumn));
const hasAdditionalFilters = FILTERS_WITH_ADHOC_FILTERS.includes(
formFilter?.filterType,
@@ -466,7 +466,7 @@ const FiltersConfigForm = (
return;
}
const formData = getFormData({
- datasetId: formFilter?.dataset?.value,
+ datasourceId: formFilter?.dataset?.value,
groupby: formFilter?.column,
...formFilter,
});
@@ -530,7 +530,7 @@ const FiltersConfigForm = (
useEffect(() => refreshHandler(), [dependenciesText]);
const newFormData = getFormData({
- datasetId,
+ datasourceId,
groupby: hasColumn ? formFilter?.column : undefined,
...formFilter,
});
@@ -540,7 +540,7 @@ const FiltersConfigForm = (
useDefaultValue(formFilter, filterToEdit);
const showDataset =
- !datasetId || datasetDetails || formFilter?.dataset?.label;
+ !datasourceId || datasetDetails || formFilter?.dataset?.label;
const formChanged = useCallback(() => {
form.setFields([
@@ -643,9 +643,9 @@ const FiltersConfigForm = (
const hasAvailableFilters = availableFilters.length > 0;
useEffect(() => {
- if (datasetId) {
+ if (datasourceId) {
cachedSupersetGet({
- endpoint: `/api/v1/dataset/${datasetId}`,
+ endpoint: `/api/v1/dataset/${datasourceId}`,
})
.then((response: JsonResponse) => {
setMetrics(response.json?.result?.metrics);
@@ -659,7 +659,7 @@ const FiltersConfigForm = (
addDangerToast(response.message);
});
}
- }, [datasetId]);
+ }, [datasourceId]);
useImperativeHandle(ref, () => ({
changeTab(tab: 'configuration' | 'scoping') {
@@ -817,7 +817,7 @@ const FiltersConfigForm = (
<DatasetSelect
onChange={(value: { label: string; value: number }) => {
// We need to reset the column when the dataset has changed
- if (value.value !== datasetId) {
+ if (value.value !== datasourceId) {
setNativeFilterFieldValues(form, filterId, {
dataset: value,
defaultDataMask: null,
@@ -966,7 +966,7 @@ const FiltersConfigForm = (
formField="granularity_sqla"
filterId={filterId}
filterValues={(column: Column) => !!column.is_dttm}
- datasetId={datasetId}
+ datasourceId={datasourceId}
onChange={column => {
// We need reset default value when when column changed
setNativeFilterFieldValues(form, filterId, {
@@ -1199,7 +1199,7 @@ const FiltersConfigForm = (
formData={newFormData}
enableNoResults={enableNoResults}
/>
- {hasDataset && datasetId && (
+ {hasDataset && datasourceId && (
<Tooltip title={t('Refresh the default values')}>
<RefreshIcon onClick={() => refreshHandler(true)} />
</Tooltip>
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.test.tsx
index 7a3af4fe26..a4e31286bf 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.test.tsx
@@ -65,7 +65,7 @@ const filterMock: Filter = {
};
const createProps: () => ControlItemsProps = () => ({
- datasetId: 1,
+ datasourceId: 1,
disabled: false,
forceUpdate: jest.fn(),
form: formMock,
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.tsx
index 22078c26a9..d8d8d60a85 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.tsx
@@ -44,7 +44,7 @@ import {
import { ColumnSelect } from './ColumnSelect';
export interface ControlItemsProps {
- datasetId: number;
+ datasourceId: number;
disabled: boolean;
forceUpdate: Function;
form: FormInstance<NativeFiltersForm>;
@@ -60,7 +60,7 @@ const CleanFormItem = styled(FormItem)`
`;
export default function getControlItemsMap({
- datasetId,
+ datasourceId,
disabled,
forceUpdate,
form,
@@ -124,7 +124,7 @@ export default function getControlItemsMap({
mode={mainControlItem.config?.multiple && 'multiple'}
form={form}
filterId={filterId}
- datasetId={datasetId}
+ datasourceId={datasourceId}
filterValues={column =>
doesColumnMatchFilterType(formFilter?.filterType || '', column)
}
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts
index 38e3d069e1..d2e9e35bea 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts
@@ -120,7 +120,7 @@ export const createHandleSave =
}
const target: Partial<NativeFilterTarget> = {};
if (formInputs.dataset) {
- target.datasetId = formInputs.dataset.value;
+ target.datasourceId = formInputs.dataset.value;
}
if (formInputs.dataset && formInputs.column) {
target.column = { name: formInputs.column };
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/utils.ts b/superset-frontend/src/dashboard/components/nativeFilters/utils.ts
index 32a060057b..4c6059d9f4 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/utils.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/utils.ts
@@ -35,7 +35,7 @@ import { CHART_TYPE, TAB_TYPE } from '../../util/componentTypes';
import { DASHBOARD_GRID_ID, DASHBOARD_ROOT_ID } from '../../util/constants';
export const getFormData = ({
- datasetId,
+ datasourceId,
dependencies = {},
groupby,
defaultDataMask,
@@ -47,7 +47,7 @@ export const getFormData = ({
granularity_sqla,
type,
}: Partial<Filter> & {
- datasetId?: number;
+ datasourceId?: number;
dependencies?: object;
groupby?: string;
adhoc_filters?: AdhocFilter[];
@@ -58,8 +58,8 @@ export const getFormData = ({
groupby?: string[];
sortMetric?: string;
} = {};
- if (datasetId) {
- otherProps.datasource = `${datasetId}__table`;
+ if (datasourceId) {
+ otherProps.datasource = `${datasourceId}__table`;
}
if (groupby) {
otherProps.groupby = [groupby];
diff --git a/superset-frontend/src/dashboard/fixtures/mockNativeFilters.ts b/superset-frontend/src/dashboard/fixtures/mockNativeFilters.ts
index 9ace211b9b..526025fa52 100644
--- a/superset-frontend/src/dashboard/fixtures/mockNativeFilters.ts
+++ b/superset-frontend/src/dashboard/fixtures/mockNativeFilters.ts
@@ -49,7 +49,7 @@ export const nativeFiltersInfo: NativeFiltersState = {
filterType: 'filter_select',
targets: [
{
- datasetId: 0,
+ datasourceId: 0,
column: {
name: 'test column',
displayName: 'test column',
diff --git a/superset-frontend/src/dashboard/util/filterboxMigrationHelper.test.ts b/superset-frontend/src/dashboard/util/filterboxMigrationHelper.test.ts
index f59f36541e..d954c51b97 100644
--- a/superset-frontend/src/dashboard/util/filterboxMigrationHelper.test.ts
+++ b/superset-frontend/src/dashboard/util/filterboxMigrationHelper.test.ts
@@ -107,7 +107,7 @@ test('should convert filter_box config to dashboard native filter config', () =>
expect(filterConfig[0].filterType).toBe('filter_select');
expect(filterConfig[0].name).toBe('region');
expect(filterConfig[0].targets).toEqual([
- { column: { name: 'region' }, datasetId: 1 },
+ { column: { name: 'region' }, datasourceId: 1 },
]);
expect(filterConfig[0].scope).toEqual({
excluded: [],
@@ -118,7 +118,7 @@ test('should convert filter_box config to dashboard native filter config', () =>
expect(filterConfig[1].filterType).toBe('filter_select');
expect(filterConfig[1].name).toBe('country_name');
expect(filterConfig[1].targets).toEqual([
- { column: { name: 'country_name' }, datasetId: 1 },
+ { column: { name: 'country_name' }, datasourceId: 1 },
]);
expect(filterConfig[1].scope).toEqual({
excluded: [],
diff --git a/superset-frontend/src/dashboard/util/filterboxMigrationHelper.ts b/superset-frontend/src/dashboard/util/filterboxMigrationHelper.ts
index 4eebbc0752..74442534c2 100644
--- a/superset-frontend/src/dashboard/util/filterboxMigrationHelper.ts
+++ b/superset-frontend/src/dashboard/util/filterboxMigrationHelper.ts
@@ -254,7 +254,7 @@ export default function getNativeFilterConfig(
filterType: FILTER_COMPONENT_FILTER_TYPES.FILTER_TIMEGRAIN,
targets: [
{
- datasetId: parseInt(datasource.split('__')[0], 10),
+ datasourceId: parseInt(datasource.split('__')[0], 10),
},
],
cascadeParentIds: [],
@@ -300,7 +300,7 @@ export default function getNativeFilterConfig(
filterType: FILTER_COMPONENT_FILTER_TYPES.FILTER_TIMECOLUMN,
targets: [
{
- datasetId: parseInt(datasource.split('__')[0], 10),
+ datasourceId: parseInt(datasource.split('__')[0], 10),
},
],
cascadeParentIds: [],
@@ -352,7 +352,7 @@ export default function getNativeFilterConfig(
filterType: FILTER_COMPONENT_FILTER_TYPES.FILTER_SELECT,
targets: [
{
- datasetId: parseInt(datasource.split('__')[0], 10),
+ datasourceId: parseInt(datasource.split('__')[0], 10),
column: {
name: config.column,
},
diff --git a/superset-frontend/src/views/routes.tsx b/superset-frontend/src/views/routes.tsx
index 88efa00a64..37d0b52753 100644
--- a/superset-frontend/src/views/routes.tsx
+++ b/superset-frontend/src/views/routes.tsx
@@ -202,7 +202,7 @@ export const routes: Routes = [
Component: AddDataset,
},
{
- path: '/dataset/:datasetId',
+ path: '/dataset/:datasourceId',
Component: AddDataset,
},
];
diff --git a/superset/dashboards/commands/export.py b/superset/dashboards/commands/export.py
index c175556943..0619f96bf8 100644
--- a/superset/dashboards/commands/export.py
+++ b/superset/dashboards/commands/export.py
@@ -137,7 +137,7 @@ class ExportDashboardsCommand(ExportModelsCommand):
"native_filter_configuration", []
):
for target in native_filter.get("targets", []):
- dataset_id = target.pop("datasetId", None)
+ dataset_id = target.pop("datasourceId", None)
if dataset_id is not None:
dataset = DatasetDAO.find_by_id(dataset_id)
if dataset:
diff --git a/superset/dashboards/commands/importers/v0.py b/superset/dashboards/commands/importers/v0.py
index e49c931896..78df29bd02 100644
--- a/superset/dashboards/commands/importers/v0.py
+++ b/superset/dashboards/commands/importers/v0.py
@@ -147,9 +147,9 @@ def import_dashboard(
return
for native_filter in native_filter_configuration:
for target in native_filter.get("targets", []):
- old_dataset_id = target.get("datasetId")
+ old_dataset_id = target.get("datasourceId")
if dataset_id_mapping and old_dataset_id is not None:
- target["datasetId"] = dataset_id_mapping.get(
+ target["datasourceId"] = dataset_id_mapping.get(
old_dataset_id,
old_dataset_id,
)
diff --git a/superset/dashboards/commands/importers/v1/utils.py b/superset/dashboards/commands/importers/v1/utils.py
index 513d1efcdb..8cc5e02ac9 100644
--- a/superset/dashboards/commands/importers/v1/utils.py
+++ b/superset/dashboards/commands/importers/v1/utils.py
@@ -132,7 +132,7 @@ def update_id_refs( # pylint: disable=too-many-locals
for target in targets:
dataset_uuid = target.pop("datasetUuid", None)
if dataset_uuid:
- target["datasetId"] = dataset_info[dataset_uuid]["datasource_id"]
+ target["datasourceId"] = dataset_info[dataset_uuid]["datasource_id"]
scope_excluded = native_filter.get("scope", {}).get("excluded", [])
if scope_excluded:
diff --git a/superset/explore/permalink/commands/get.py b/superset/explore/permalink/commands/get.py
index 3376cab080..06580cc366 100644
--- a/superset/explore/permalink/commands/get.py
+++ b/superset/explore/permalink/commands/get.py
@@ -48,7 +48,7 @@ class GetExplorePermalinkCommand(BaseExplorePermalinkCommand):
chart_id: Optional[int] = value.get("chartId")
# keep this backward compatible for old permalinks
datasource_id: int = (
- value.get("datasourceId") or value.get("datasetId") or 0
+ value.get("datasourceId") or value.get("datasourceId") or 0
)
datasource_type = DatasourceType(
value.get("datasourceType", DatasourceType.TABLE)
diff --git a/superset/explore/permalink/types.py b/superset/explore/permalink/types.py
index 393f0ed8d5..a2cb32f83e 100644
--- a/superset/explore/permalink/types.py
+++ b/superset/explore/permalink/types.py
@@ -24,10 +24,9 @@ class ExplorePermalinkState(TypedDict, total=False):
class ExplorePermalinkValue(TypedDict):
chartId: Optional[int]
- # either datasetId or datasourceId is required
- # TODO: deprecated - datasetId is deprecated
+ # either datasourceId or datasourceId is required
+ # TODO: deprecated - datasourceId is deprecated
# and should be removed in next major release
- datasetId: Optional[int]
datasourceId: Optional[int]
datasourceType: str
datasource: str
diff --git a/superset/models/dashboard.py b/superset/models/dashboard.py
index ae6bae4b73..4ce64a95a3 100644
--- a/superset/models/dashboard.py
+++ b/superset/models/dashboard.py
@@ -402,7 +402,7 @@ class Dashboard(Model, AuditMixinNullable, ImportExportMixin):
for native_filter in native_filter_configuration:
session = db.session()
for target in native_filter.get("targets", []):
- id_ = target.get("datasetId")
+ id_ = target.get("datasourceId")
if id_ is None:
continue
datasource = DatasourceDAO.get_datasource(
diff --git a/tests/integration_tests/explore/permalink/commands_tests.py b/tests/integration_tests/explore/permalink/commands_tests.py
index 63ed02cd7b..6fdecccefe 100644
--- a/tests/integration_tests/explore/permalink/commands_tests.py
+++ b/tests/integration_tests/explore/permalink/commands_tests.py
@@ -160,7 +160,7 @@ class TestCreatePermalinkDataCommand(SupersetTestCase):
decode_id_mock.return_value = "123456"
get_kv_command_mock.return_value = {
"chartId": slice.id,
- "datasetId": dataset.id,
+ "datasourceId": dataset.id,
"datasource": datasource_string,
"state": {
"formData": {"datasource": datasource_string, "slice_id": slice.id}
diff --git a/tests/integration_tests/migrations/fc3a3a8ff221_migrate_filter_sets_to_new_format__tests.py b/tests/integration_tests/migrations/fc3a3a8ff221_migrate_filter_sets_to_new_format__tests.py
index 8d08214ea5..b1403ed65f 100644
--- a/tests/integration_tests/migrations/fc3a3a8ff221_migrate_filter_sets_to_new_format__tests.py
+++ b/tests/integration_tests/migrations/fc3a3a8ff221_migrate_filter_sets_to_new_format__tests.py
@@ -40,7 +40,7 @@ native_filters_v1 = [
"isInstant": True,
"name": "Region",
"scope": {"excluded": [], "rootPath": ["ROOT_ID"]},
- "targets": [{"column": {"name": "region"}, "datasetId": 2}],
+ "targets": [{"column": {"name": "region"}, "datasourceId": 2}],
},
{
"cascadeParentIds": [],
@@ -67,7 +67,7 @@ native_filters_v1 = [
"isInstant": True,
"name": "Country",
"scope": {"excluded": [], "rootPath": ["ROOT_ID"]},
- "targets": [{"column": {"name": "country_name"}, "datasetId": 2}],
+ "targets": [{"column": {"name": "country_name"}, "datasourceId": 2}],
},
]
native_filters_v2 = [
@@ -86,7 +86,7 @@ native_filters_v2 = [
"isInstant": True,
"name": "Region",
"scope": {"excluded": [], "rootPath": ["ROOT_ID"]},
- "targets": [{"column": {"name": "region"}, "datasetId": 2}],
+ "targets": [{"column": {"name": "region"}, "datasourceId": 2}],
},
{
"cascadeParentIds": [],
@@ -113,7 +113,7 @@ native_filters_v2 = [
"isInstant": True,
"name": "Country",
"scope": {"excluded": [], "rootPath": ["ROOT_ID"]},
- "targets": [{"column": {"name": "country_name"}, "datasetId": 2}],
+ "targets": [{"column": {"name": "country_name"}, "datasourceId": 2}],
},
]
@@ -145,7 +145,7 @@ filter_sets_v1 = {
"isInstant": False,
"name": "Platform",
"scope": {"excluded": [], "rootPath": ["ROOT_ID"]},
- "targets": [{"column": {"name": "platform"}, "datasetId": 33}],
+ "targets": [{"column": {"name": "platform"}, "datasourceId": 33}],
},
"NATIVE_FILTER-B2PFYVIUw": {
"cascadeParentIds": [],
@@ -161,7 +161,7 @@ filter_sets_v1 = {
"isInstant": False,
"name": "Genre",
"scope": {"excluded": [], "rootPath": ["ROOT_ID"]},
- "targets": [{"column": {"name": "genre"}, "datasetId": 33}],
+ "targets": [{"column": {"name": "genre"}, "datasourceId": 33}],
},
"NATIVE_FILTER-VDLd4Wq-v": {
"cascadeParentIds": [],
@@ -177,7 +177,7 @@ filter_sets_v1 = {
"isInstant": False,
"name": "Publisher",
"scope": {"excluded": [], "rootPath": ["ROOT_ID"]},
- "targets": [{"column": {"name": "publisher"}, "datasetId": 33}],
+ "targets": [{"column": {"name": "publisher"}, "datasourceId": 33}],
},
},
"dataMask": {
@@ -255,7 +255,7 @@ filter_sets_v2 = {
"isInstant": False,
"name": "Platform",
"scope": {"excluded": [], "rootPath": ["ROOT_ID"]},
- "targets": [{"column": {"name": "platform"}, "datasetId": 33}],
+ "targets": [{"column": {"name": "platform"}, "datasourceId": 33}],
},
"NATIVE_FILTER-B2PFYVIUw": {
"cascadeParentIds": [],
@@ -272,7 +272,7 @@ filter_sets_v2 = {
"isInstant": False,
"name": "Genre",
"scope": {"excluded": [], "rootPath": ["ROOT_ID"]},
- "targets": [{"column": {"name": "genre"}, "datasetId": 33}],
+ "targets": [{"column": {"name": "genre"}, "datasourceId": 33}],
},
"NATIVE_FILTER-VDLd4Wq-v": {
"cascadeParentIds": [],
@@ -289,7 +289,7 @@ filter_sets_v2 = {
"isInstant": False,
"name": "Publisher",
"scope": {"excluded": [], "rootPath": ["ROOT_ID"]},
- "targets": [{"column": {"name": "publisher"}, "datasetId": 33}],
+ "targets": [{"column": {"name": "publisher"}, "datasourceId": 33}],
},
},
"dataMask": {