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 2023/01/11 01:08:41 UTC
[superset] branch hxgh-ssh-dynamic-form created (now ffd9a56445)
This is an automated email from the ASF dual-hosted git repository.
hugh pushed a change to branch hxgh-ssh-dynamic-form
in repository https://gitbox.apache.org/repos/asf/superset.git
at ffd9a56445 functionality works
This branch includes the following new commits:
new ffd9a56445 functionality works
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[superset] 01/01: functionality works
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hugh pushed a commit to branch hxgh-ssh-dynamic-form
in repository https://gitbox.apache.org/repos/asf/superset.git
commit ffd9a56445276e5e0a3cfad24ed0b802dc519ef2
Author: hughhhh <hu...@gmail.com>
AuthorDate: Wed Jan 11 01:08:04 2023 +0000
functionality works
---
.../CRUD/data/database/DatabaseModal/index.tsx | 160 +++++++++++----------
1 file changed, 87 insertions(+), 73 deletions(-)
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
index d4a78a7fca..aba9e89088 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -1281,6 +1281,37 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
});
};
+ const renderSomething = () => (
+ <SSHTunnelForm
+ isEditMode={isEditMode}
+ sshTunneling={sshTunneling}
+ db={db as DatabaseObject}
+ dbFetched={dbFetched as DatabaseObject}
+ onSSHTunnelParametersChange={({
+ target,
+ }: {
+ target: HTMLInputElement | HTMLTextAreaElement;
+ }) =>
+ onChange(ActionType.parametersSSHTunnelChange, {
+ type: target.type,
+ name: target.name,
+ value: target.value,
+ })
+ }
+ setSSHTunnelLoginMethod={(method: AuthType) =>
+ setDB({
+ type: ActionType.setSSHTunnelLoginMethod,
+ payload: { login_method: method },
+ })
+ }
+ removeSSHTunnelConfig={() =>
+ setDB({
+ type: ActionType.removeSSHTunnelConfig,
+ })
+ }
+ />
+ );
+
const renderCTABtns = () => (
<StyledBtns>
<Button
@@ -1487,36 +1518,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
testConnection={testConnection}
testInProgress={testInProgress}
>
- {sshTunneling && (
- <SSHTunnelForm
- isEditMode={isEditMode}
- sshTunneling={sshTunneling}
- db={db as DatabaseObject}
- dbFetched={dbFetched as DatabaseObject}
- onSSHTunnelParametersChange={({
- target,
- }: {
- target: HTMLInputElement | HTMLTextAreaElement;
- }) =>
- onChange(ActionType.parametersSSHTunnelChange, {
- type: target.type,
- name: target.name,
- value: target.value,
- })
- }
- setSSHTunnelLoginMethod={(method: AuthType) =>
- setDB({
- type: ActionType.setSSHTunnelLoginMethod,
- payload: { login_method: method },
- })
- }
- removeSSHTunnelConfig={() =>
- setDB({
- type: ActionType.removeSSHTunnelConfig,
- })
- }
- />
- )}
+ {sshTunneling && renderSomething()}
</SqlAlchemyForm>
{isDynamic(db?.backend || db?.engine) && !isEditMode && (
<div css={(theme: SupersetTheme) => infoTooltip(theme)}>
@@ -1547,49 +1549,60 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
)}
</StyledAlignment>
) : (
- <DatabaseConnectionForm
- isEditMode
- sslForced={sslForced}
- dbModel={dbModel}
- db={db as DatabaseObject}
- onParametersChange={({ target }: { target: HTMLInputElement }) =>
- onChange(ActionType.parametersChange, {
- type: target.type,
- name: target.name,
- checked: target.checked,
- value: target.value,
- })
- }
- onExtraInputChange={({ target }: { target: HTMLInputElement }) =>
- onChange(ActionType.extraInputChange, {
- name: target.name,
- value: target.value,
- })
- }
- onChange={({ target }: { target: HTMLInputElement }) =>
- onChange(ActionType.textChange, {
- name: target.name,
- value: target.value,
- })
- }
- onQueryChange={({ target }: { target: HTMLInputElement }) =>
- onChange(ActionType.queryChange, {
- name: target.name,
- value: target.value,
- })
- }
- onAddTableCatalog={() =>
- setDB({ type: ActionType.addTableCatalogSheet })
- }
- onRemoveTableCatalog={(idx: number) =>
- setDB({
- type: ActionType.removeTableCatalogSheet,
- payload: { indexToDelete: idx },
- })
- }
- getValidation={() => getValidation(db)}
- validationErrors={validationErrors}
- />
+ <div>
+ hello1
+ <DatabaseConnectionForm
+ isEditMode
+ sslForced={sslForced}
+ dbModel={dbModel}
+ db={db as DatabaseObject}
+ onParametersChange={({
+ target,
+ }: {
+ target: HTMLInputElement;
+ }) =>
+ onChange(ActionType.parametersChange, {
+ type: target.type,
+ name: target.name,
+ checked: target.checked,
+ value: target.value,
+ })
+ }
+ onExtraInputChange={({
+ target,
+ }: {
+ target: HTMLInputElement;
+ }) =>
+ onChange(ActionType.extraInputChange, {
+ name: target.name,
+ value: target.value,
+ })
+ }
+ onChange={({ target }: { target: HTMLInputElement }) =>
+ onChange(ActionType.textChange, {
+ name: target.name,
+ value: target.value,
+ })
+ }
+ onQueryChange={({ target }: { target: HTMLInputElement }) =>
+ onChange(ActionType.queryChange, {
+ name: target.name,
+ value: target.value,
+ })
+ }
+ onAddTableCatalog={() =>
+ setDB({ type: ActionType.addTableCatalogSheet })
+ }
+ onRemoveTableCatalog={(idx: number) =>
+ setDB({
+ type: ActionType.removeTableCatalogSheet,
+ payload: { indexToDelete: idx },
+ })
+ }
+ getValidation={() => getValidation(db)}
+ validationErrors={validationErrors}
+ />
+ </div>
)}
{!isEditMode && (
<StyledAlertMargin>
@@ -1790,6 +1803,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
validationErrors={validationErrors}
getPlaceholder={getPlaceholder}
/>
+ {sshTunneling && renderSomething()}
<div css={(theme: SupersetTheme) => infoTooltip(theme)}>
{dbModel.engine !== Engines.GSheet && (
<>