From d0a598d8bdeb5b2cdb904e4208a0d69f3b831f9d Mon Sep 17 00:00:00 2001 From: Jack Gluskin Date: Wed, 7 Aug 2024 11:56:03 +0100 Subject: [PATCH] Configure initial type of PostgreSQL cloud UI depending if destination is managed --- .../cloud-config-ui/package-lock.json | 20 +++++++++---------- .../postgresql/cloud-config-ui/package.json | 4 ++-- .../postgresql/cloud-config-ui/src/App.tsx | 6 +++++- .../cloud-config-ui/src/form/index.tsx | 8 ++++++-- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/plugins/destination/postgresql/cloud-config-ui/package-lock.json b/plugins/destination/postgresql/cloud-config-ui/package-lock.json index b5fdfbcac11ec8..436bd7a2e6db74 100644 --- a/plugins/destination/postgresql/cloud-config-ui/package-lock.json +++ b/plugins/destination/postgresql/cloud-config-ui/package-lock.json @@ -9,8 +9,8 @@ "version": "0.1.0", "dependencies": { "@cloudquery/cloud-ui": "^0.1.12", - "@cloudquery/plugin-config-ui-connector": "^0.2.10", - "@cloudquery/plugin-config-ui-lib": "^0.0.53", + "@cloudquery/plugin-config-ui-connector": "^0.2.12", + "@cloudquery/plugin-config-ui-lib": "^0.0.54", "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.5", "@mui/icons-material": "^5.15.20", @@ -2102,22 +2102,20 @@ } }, "node_modules/@cloudquery/plugin-config-ui-connector": { - "version": "0.2.11", - "resolved": "https://registry.npmjs.org/@cloudquery/plugin-config-ui-connector/-/plugin-config-ui-connector-0.2.11.tgz", - "integrity": "sha512-YVnXsLewOb7peJ7kCS/N7cUZQvRi3hcttKeQsxPo9KNgq2cars7YMhFQ5D/lBPSG2mVLKs9M1K+y5q/8drh2HQ==", - "license": "MPL-2.0" + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/@cloudquery/plugin-config-ui-connector/-/plugin-config-ui-connector-0.2.12.tgz", + "integrity": "sha512-lBUPtH4sU5ineHSKcIO6MJvF3dQ29Klf2h62/LDifH9sUy+t69KWXhM8deFY5etGmo93As9hohQGZiKlUS8+og==" }, "node_modules/@cloudquery/plugin-config-ui-lib": { - "version": "0.0.53", - "resolved": "https://registry.npmjs.org/@cloudquery/plugin-config-ui-lib/-/plugin-config-ui-lib-0.0.53.tgz", - "integrity": "sha512-rcrj1MHFS0UTkToH+oCv0fmvp4KMHQB168jBT2RQhfy2WCHDAbyu2avBK8DKQ5RgFpDDcJL4cMRpt7wc/g/AeQ==", - "license": "MPL-2.0", + "version": "0.0.54", + "resolved": "https://registry.npmjs.org/@cloudquery/plugin-config-ui-lib/-/plugin-config-ui-lib-0.0.54.tgz", + "integrity": "sha512-C5F3672w6L2jziq/uRCa1EHy2DbzcBaMxltaON3UJ6PE6pS9+0Dpln30qplId4zh2bbSahtlTWyUxbxVOydgAw==", "dependencies": { "@cloudquery/cloud-ui": "^0.1.8", "@rudderstack/analytics-js": "3.7.6" }, "peerDependencies": { - "@cloudquery/plugin-config-ui-connector": "^0.2.11", + "@cloudquery/plugin-config-ui-connector": "^0.2.12", "@mui/icons-material": "^5.15.20", "@mui/lab": "^5.0.0-alpha.170", "@mui/material": "^5.15.20", diff --git a/plugins/destination/postgresql/cloud-config-ui/package.json b/plugins/destination/postgresql/cloud-config-ui/package.json index 2de7961e09b252..442b46df4a5cb5 100644 --- a/plugins/destination/postgresql/cloud-config-ui/package.json +++ b/plugins/destination/postgresql/cloud-config-ui/package.json @@ -5,8 +5,8 @@ "homepage": "./", "dependencies": { "@cloudquery/cloud-ui": "^0.1.12", - "@cloudquery/plugin-config-ui-connector": "^0.2.10", - "@cloudquery/plugin-config-ui-lib": "^0.0.53", + "@cloudquery/plugin-config-ui-connector": "^0.2.12", + "@cloudquery/plugin-config-ui-lib": "^0.0.54", "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.5", "@mui/icons-material": "^5.15.20", diff --git a/plugins/destination/postgresql/cloud-config-ui/src/App.tsx b/plugins/destination/postgresql/cloud-config-ui/src/App.tsx index 739bdfcf3cf7f6..d0feda2a2206bf 100644 --- a/plugins/destination/postgresql/cloud-config-ui/src/App.tsx +++ b/plugins/destination/postgresql/cloud-config-ui/src/App.tsx @@ -19,7 +19,10 @@ const DevWrapper = useCloudAppMock ? CloudAppMock : Fragment; const devWrapperProps: any = useCloudAppMock ? require('./.env.json') : undefined; function App() { - const { initialValues, initialized } = useFormInit(pluginUiMessageHandler, false); + const { initialValues, initialized, isManagedDestination } = useFormInit( + pluginUiMessageHandler, + false, + ); useFormHeightChange(pluginUiMessageHandler); const theme = useMemo(() => createTheme(createThemeOptions()), []); @@ -33,6 +36,7 @@ function App() {
diff --git a/plugins/destination/postgresql/cloud-config-ui/src/form/index.tsx b/plugins/destination/postgresql/cloud-config-ui/src/form/index.tsx index c67a385d27e388..0739718fd3ff29 100644 --- a/plugins/destination/postgresql/cloud-config-ui/src/form/index.tsx +++ b/plugins/destination/postgresql/cloud-config-ui/src/form/index.tsx @@ -22,14 +22,18 @@ import { FormConnectionFields } from './connectionFields'; interface Props { initialValues: FormValues | undefined; + isManagedDestination: boolean; } const formDefaultValues = formValidationSchema.getDefault(); const formValidationResolver = getYupValidationResolver(formValidationSchema); -export function Form({ initialValues }: Props) { +export function Form({ initialValues, isManagedDestination }: Props) { const formContext = useForm({ - defaultValues: initialValues || formDefaultValues, + defaultValues: initialValues || { + ...formDefaultValues, + connectionType: isManagedDestination ? 'string' : 'fields', + }, resolver: formValidationResolver, }); const { control, handleSubmit: handleFormSubmit, getValues } = formContext;