pt/superset
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2024-09-06 13:57:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: Edit physical dataset from the Edit Dataset modal (#15770)

Browse Source 
* Remove unnecessary onChange

* Remove confliciting onChange

* Revert unnecessary change

* Enhance and fix tests
This commit is contained in:
Geido 2021-07-19 20:39:01 +02:00 committed by GitHub
parent 239336c3e8
commit a7cbcde9bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
superset-frontend/src/components/DatabaseSelector/DatabaseSelector.test.tsx
View File

@ -38,7 +38,7 @@ const createProps = () => ({
onDbChange: jest.fn(),
onSchemaChange: jest.fn(),
onSchemasLoad: jest.fn(),
onChange: jest.fn(),
onUpdate: jest.fn(),
});
beforeEach(() => {
@ -161,7 +161,7 @@ test('Refresh should work', async () => {
expect(props.onDbChange).toBeCalledTimes(0);
expect(props.onSchemaChange).toBeCalledTimes(0);
expect(props.onSchemasLoad).toBeCalledTimes(1);
expect(props.onChange).toBeCalledTimes(0);
expect(props.onUpdate).toBeCalledTimes(0);
});
userEvent.click(screen.getByRole('button'));
@ -174,7 +174,7 @@ test('Refresh should work', async () => {
expect(props.onDbChange).toBeCalledTimes(1);
expect(props.onSchemaChange).toBeCalledTimes(1);
expect(props.onSchemasLoad).toBeCalledTimes(2);
expect(props.onChange).toBeCalledTimes(1);
expect(props.onUpdate).toBeCalledTimes(1);
});
});

8
superset-frontend/src/components/DatabaseSelector/index.tsx
View File

@ -72,7 +72,7 @@ interface DatabaseSelectorProps {
readOnly?: boolean;
schema?: string;
sqlLabMode?: boolean;
onChange?: ({
onUpdate?: ({
dbId,
schema,
}: {
@ -89,7 +89,7 @@ export default function DatabaseSelector({
getTableList,
handleError,
isDatabaseSelectEnabled = true,
onChange,
onUpdate,
onDbChange,
onSchemaChange,
onSchemasLoad,
@ -143,8 +143,8 @@ export default function DatabaseSelector({
function onSelectChange({ dbId, schema }: { dbId: number; schema?: string }) {
setCurrentDbId(dbId);
setCurrentSchema(schema);
if (onChange) {
onChange({ dbId, schema, tableName: undefined });
if (onUpdate) {
onUpdate({ dbId, schema, tableName: undefined });
}
}

10
superset-frontend/src/components/TableSelector/index.tsx
View File

@ -90,7 +90,7 @@ interface TableSelectorProps {
getDbList?: (arg0: any) => {};
handleError: (msg: string) => void;
isDatabaseSelectEnabled?: boolean;
onChange?: ({
onUpdate?: ({
dbId,
schema,
}: {
@ -117,7 +117,7 @@ const TableSelector: FunctionComponent<TableSelectorProps> = ({
getDbList,
handleError,
isDatabaseSelectEnabled = true,
onChange,
onUpdate,
onDbChange,
onSchemaChange,
onSchemasLoad,
@ -198,8 +198,8 @@ const TableSelector: FunctionComponent<TableSelectorProps> = ({
}) {
setCurrentTableName(tableName);
setCurrentSchema(schema);
if (onChange) {
onChange({ dbId, schema, tableName });
if (onUpdate) {
onUpdate({ dbId, schema, tableName });
}
}
@ -299,7 +299,7 @@ const TableSelector: FunctionComponent<TableSelectorProps> = ({
getDbList={getDbList}
getTableList={fetchTables}
handleError={handleError}
onChange={onSelectionChange}
onUpdate={onSelectionChange}
onDbChange={readOnly ? undefined : onDbChange}
onSchemaChange={readOnly ? undefined : onSchemaChange}
onSchemasLoad={onSchemasLoad}

2
superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx
View File

@ -108,7 +108,7 @@ const DatasetModal: FunctionComponent<DatasetModalProps> = ({
dbId={datasourceId}
formMode
handleError={addDangerToast}
onChange={onChange}
onUpdate={onChange}
schema={currentSchema}
tableName={currentTableName}
/>