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

feat: add Close/Finish buttons to DBModal on Edit #15199

Merged
merged 7 commits into from
Jun 16, 2021
Merged

feat: add Close/Finish buttons to DBModal on Edit #15199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dbbf58c
fix: add icons (#15122)
AAfghahi Jun 11, 2021
e5b66dc
Merge branch 'pexdax/db-connection-ui' of ssh://github.com/apache/sup…
AAfghahi Jun 11, 2021
03d3326
Merge branch 'pexdax/db-connection-ui' of ssh://github.com/apache/sup…
AAfghahi Jun 15, 2021
5cfe664
Merge branch 'pexdax/db-connection-ui' of ssh://github.com/apache/sup…
AAfghahi Jun 15, 2021
7a7f39b
Merge branch 'pexdax/db-connection-ui' of ssh://github.com/apache/sup…
AAfghahi Jun 16, 2021
54965a1
Merge branch 'pexdax/db-connection-ui' of ssh://github.com/apache/sup…
AAfghahi Jun 16, 2021
72335ce
editDBModal footer
AAfghahi Jun 16, 2021
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: 5 additions & 5 deletions superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ interface FieldPropTypes {
db?: DatabaseObject;
isEditMode?: boolean;
sslForced?: boolean;
name?: string;
defaultDBName?: string;
}

const CredentialsInfo = ({ changeMethods }: FieldPropTypes) => {
Expand Down Expand Up @@ -258,13 +258,13 @@ const displayField = ({
getValidation,
validationErrors,
db,
name,
defaultDBName,
}: FieldPropTypes) => (
<ValidatedInput
id="database_name"
name="database_name"
required={required}
value={db?.database_name || name}
value={db?.database_name || defaultDBName}
validationMethods={{ onBlur: getValidation }}
errorMessage={validationErrors?.database_name}
placeholder=""
Expand Down Expand Up @@ -337,7 +337,7 @@ const FORM_FIELD_MAP = {
};

const DatabaseConnectionForm = ({
dbModel: { name, parameters },
dbModel: { name: defaultDBName, parameters },
onParametersChange,
onChange,
onParametersUploadFileChange,
Expand Down Expand Up @@ -384,7 +384,7 @@ const DatabaseConnectionForm = ({
onChange,
onParametersUploadFileChange,
},
name,
defaultDBName,
validationErrors,
getValidation,
db,
Expand Down
12 changes: 11 additions & 1 deletion superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,16 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
]
: [];

const renderEditModalFooter = () => (
<>
<StyledFooterButton key="close" onClick={onClose}>
Close
</StyledFooterButton>
<StyledFooterButton key="submit" buttonStyle="primary" onClick={onSave}>
Finish
</StyledFooterButton>
</>
);
useEffect(() => {
if (show) {
setTabKey(DEFAULT_TAB_KEY);
Expand Down Expand Up @@ -593,7 +603,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
title={
<h4>{isEditMode ? t('Edit database') : t('Connect a database')}</h4>
}
footer={renderModalFooter()}
footer={isEditMode ? renderEditModalFooter() : renderModalFooter()}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ahhhhh this was what we needed

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yup yup

>
<TabHeader>
<ModalHeader
Expand Down
7 changes: 6 additions & 1 deletion superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ export const no_margin_bottom = css`
margin-bottom: 0;
`;

export const marginBottom = (theme: SupersetTheme) => css`
margin-bottom: ${theme.gridUnit * 4}px;
`;

export const StyledFormHeader = styled.header`
border-bottom: ${({ theme }) => `${theme.gridUnit * 0.25}px solid
${theme.colors.grayscale.light2};`}
Expand Down Expand Up @@ -137,7 +141,8 @@ export const antDModalStyles = (theme: SupersetTheme) => css`
export const antDAlertStyles = (theme: SupersetTheme) => css`
border: 1px solid ${theme.colors.info.base};
padding: ${theme.gridUnit * 4}px;
margin: ${theme.gridUnit * 8}px ${theme.gridUnit * 3}px 0;
margin: ${theme.gridUnit * 8}px ${theme.gridUnit * 3}px
${theme.gridUnit * 4}px;
.ant-alert-message {
color: ${theme.colors.info.dark2};
font-size: ${theme.typography.sizes.s + 1}px;
Expand Down