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

Jump to bottom

fix: double scroll bars on dataset editor #11095

Merged
merged 2 commits into from
Sep 29, 2020
Merged

fix: double scroll bars on dataset editor #11095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd627c3
fix double scroll bar on dataset editor
Sep 29, 2020
8725765
add table name to virtual tab
Sep 29, 2020
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
18 changes: 13 additions & 5 deletions superset-frontend/src/datasource/DatasourceEditor.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ import Field from 'src/CRUD/Field';
import withToasts from 'src/messageToasts/enhancers/withToasts';

const DatasourceContainer = styled.div`
.tab-content {
height: 600px;
overflow: auto;
}

.change-warning {
margin: 16px 10px 0;
color: ${({ theme }) => theme.colors.warning.base};
Expand Down Expand Up @@ -656,6 +651,19 @@ class DatasourceEditor extends React.PureComponent {
/>
}
/>
<Field
fieldKey="table_name"
label={t('table name')}
control={
<TextControl
controlId="table_name"
onChange={table => {
this.onDatasourcePropChange('table_name', table);
}}
placeholder={t('Type table name')}
/>
}
/>
<Field
fieldKey="sql"
label={t('SQL')}
Expand Down
27 changes: 24 additions & 3 deletions superset-frontend/src/datasource/DatasourceModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,35 @@ import React, { FunctionComponent, useState, useRef } from 'react';
import { Alert, Modal } from 'react-bootstrap';
import Button from 'src/components/Button';
import Dialog from 'react-bootstrap-dialog';
import { t, SupersetClient } from '@superset-ui/core';
import { styled, t, SupersetClient } from '@superset-ui/core';
import AsyncEsmComponent from 'src/components/AsyncEsmComponent';

import getClientErrorObject from 'src/utils/getClientErrorObject';
import withToasts from 'src/messageToasts/enhancers/withToasts';

const DatasourceEditor = AsyncEsmComponent(() => import('./DatasourceEditor'));

const StyledDatasourceModal = styled(Modal)`
.modal-content {
height: 900px;
display: flex;
flex-direction: column;
align-items: stretch;
}

.modal-header {
flex: 0 1 auto;
}
.modal-body {
flex: 1 1 auto;
overflow: auto;
}

.modal-footer {
flex: 0 1 auto;
}
`;

interface DatasourceModalProps {
addSuccessToast: (msg: string) => void;
datasource: any;
Expand Down Expand Up @@ -137,7 +158,7 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
};

return (
<Modal show={show} onHide={onHide} bsSize="large">
<StyledDatasourceModal show={show} onHide={onHide} bsSize="large">
<Modal.Header closeButton>
<Modal.Title>
<div>
Expand Down Expand Up @@ -187,7 +208,7 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
<Dialog ref={dialog} />
</span>
</Modal.Footer>
</Modal>
</StyledDatasourceModal>
);
};

Expand Down