This will be the table name used when writing queries
You can use * to select multiple files.
@@ -128,6 +152,13 @@ export function DatawarehouseTableForm(): JSX.Element {
)}
+
+ Save
+
+
+ )}
)
}
diff --git a/frontend/src/scenes/data-warehouse/new/NewSourceWizard.tsx b/frontend/src/scenes/data-warehouse/new/NewSourceWizard.tsx
index eb2aafa9d7e6c..2b8e8e9672a54 100644
--- a/frontend/src/scenes/data-warehouse/new/NewSourceWizard.tsx
+++ b/frontend/src/scenes/data-warehouse/new/NewSourceWizard.tsx
@@ -1,9 +1,10 @@
import { LemonButton, LemonTable, Link } from '@posthog/lemon-ui'
-import { useActions, useValues } from 'kea'
+import { BindLogic, useActions, useValues } from 'kea'
import { PageHeader } from 'lib/components/PageHeader'
import { FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
import { useCallback, useEffect } from 'react'
+import { DataWarehouseSourceIcon } from 'scenes/data-warehouse/settings/DataWarehouseSourceIcon'
import { SceneExport } from 'scenes/sceneTypes'
import { ManualLinkSourceType, SourceConfig } from '~/types'
@@ -13,7 +14,6 @@ import SchemaForm from '../external/forms/SchemaForm'
import SourceForm from '../external/forms/SourceForm'
import { SyncProgressStep } from '../external/forms/SyncProgressStep'
import { DatawarehouseTableForm } from '../new/DataWarehouseTableForm'
-import { RenderDataWarehouseSourceIcon } from '../settings/DataWarehouseManagedSourcesTable'
import { dataWarehouseTableLogic } from './dataWarehouseTableLogic'
import { sourceWizardLogic } from './sourceWizardLogic'
@@ -160,33 +160,29 @@ function FirstStep(): JSX.Element {
{
title: 'Source',
width: 0,
- render: function RenderAppInfo(_, sourceConfig) {
- return
- onClick(sourceConfig)} className="my-2" type="primary">
- Link
-
-
- )
- },
+ render: (_, sourceConfig) => (
+
+ onClick(sourceConfig)} className="my-2" type="primary">
+ Link
+
+
+ ),
},
]}
/>
@@ -205,33 +201,29 @@ function FirstStep(): JSX.Element {
{
title: 'Source',
width: 0,
- render: function RenderAppInfo(_, sourceConfig) {
- return
- onManualLinkClick(sourceConfig.type)}
- className="my-2"
- type="primary"
- >
- Link
-
-
- )
- },
+ render: (_, sourceConfig) => (
+
+ onManualLinkClick(sourceConfig.type)}
+ className="my-2"
+ type="primary"
+ >
+ Link
+
+
+ ),
},
]}
/>
@@ -242,7 +234,13 @@ function FirstStep(): JSX.Element {
function SecondStep(): JSX.Element {
const { selectedConnector } = useValues(sourceWizardLogic)
- return selectedConnector ?
- {sourceReloadingById[source.id] ? (
-
+ ),
},
]}
/>
@@ -169,55 +148,3 @@ export function getDataWarehouseSourceUrl(service: string): string {
return `https://posthog.com/docs/data-warehouse/setup#${service.toLowerCase()}`
}
-
-export function RenderDataWarehouseSourceIcon({
- type,
- size = 'small',
-}: {
- type: string
- size?: 'small' | 'medium'
-}): JSX.Element {
- const sizePx = size === 'small' ? 30 : 60
-
- const icon = {
- Stripe: IconStripe,
- Hubspot: IconHubspot,
- Zendesk: IconZendesk,
- Postgres: IconPostgres,
- MySQL: IconMySQL,
- Snowflake: IconSnowflake,
- aws: IconAwsS3,
- 'google-cloud': IconGoogleCloudStorage,
- 'cloudflare-r2': IconCloudflare,
- azure: Iconazure,
- Salesforce: IconSalesforce,
- MSSQL: IconMSSQL,
- Vitally: IconVitally,
- BigQuery: IconBigQuery,
- Chargebee: IconChargebee,
- }[type]
-
- return (
-
-
- ) : (
-
-
-
- {
- reloadSource(source)
- }}
- >
- Reload
-
-
-
+ render: (_, source) => (
+ {
+ LemonDialog.open({
+ title: 'Delete data source?',
+ description:
+ 'Are you sure you want to delete this data source? All related tables will be deleted.',
+
+ primaryButton: {
+ children: 'Delete',
+ status: 'danger',
+ onClick: () => deleteSource(source),
+ },
+ secondaryButton: {
+ children: 'Cancel',
+ },
+ })
+ }}
+ >
+ Delete
+
+
+ }
+ />
+
+ )}
+
+ {sourceReloadingById[source.id] ? (
+
- )
- },
+
+
+
+
+ ) : (
+
+
+
{
- LemonDialog.open({
- title: 'Delete data source?',
- description:
- 'Are you sure you want to delete this data source? All related tables will be deleted.',
-
- primaryButton: {
- children: 'Delete',
- status: 'danger',
- onClick: () => deleteSource(source),
- },
- secondaryButton: {
- children: 'Cancel',
- },
- })
+ reloadSource(source)
}}
>
- Delete
+ Reload
-
- }
- />
-
- )}
-
-
- {type}
-
- Click to view docs - - } - > - -
-
-
-
- )
-}
diff --git a/frontend/src/scenes/data-warehouse/settings/DataWarehouseSelfManagedSourcesTable.tsx b/frontend/src/scenes/data-warehouse/settings/DataWarehouseSelfManagedSourcesTable.tsx
index 19e37015f5760..4e0680be2ebf3 100644
--- a/frontend/src/scenes/data-warehouse/settings/DataWarehouseSelfManagedSourcesTable.tsx
+++ b/frontend/src/scenes/data-warehouse/settings/DataWarehouseSelfManagedSourcesTable.tsx
@@ -1,7 +1,11 @@
import { LemonButton, LemonDialog, LemonTable } from '@posthog/lemon-ui'
import { useActions, useValues } from 'kea'
+import { LemonTableLink } from 'lib/lemon-ui/LemonTable/LemonTableLink'
+import { DataWarehouseSourceIcon, mapUrlToProvider } from 'scenes/data-warehouse/settings/DataWarehouseSourceIcon'
+import { urls } from 'scenes/urls'
import { DatabaseSchemaDataWarehouseTable } from '~/queries/schema'
+import { PipelineNodeTab, PipelineStage } from '~/types'
import { dataWarehouseSettingsLogic } from './dataWarehouseSettingsLogic'
@@ -15,50 +19,64 @@ export function DataWarehouseSelfManagedSourcesTable(): JSX.Element {
pagination={{ pageSize: 10 }}
columns={[
{
- title: 'Name',
+ width: 0,
+ render: (_, item: DatabaseSchemaDataWarehouseTable) => (
+ - Click to view docs - - } - > - -
- refreshSelfManagedTableSchema(item.id)}
- >
- Update schema from source
-
- {
- LemonDialog.open({
- title: 'Delete table?',
- description:
- 'Table deletion cannot be undone. All views and joins related to this table will be deleted.',
+ render: (_, item: DatabaseSchemaDataWarehouseTable) => (
+
+
+ ),
},
]}
/>
diff --git a/frontend/src/scenes/data-warehouse/settings/DataWarehouseSourceIcon.tsx b/frontend/src/scenes/data-warehouse/settings/DataWarehouseSourceIcon.tsx
new file mode 100644
index 0000000000000..4dca0f4e269ab
--- /dev/null
+++ b/frontend/src/scenes/data-warehouse/settings/DataWarehouseSourceIcon.tsx
@@ -0,0 +1,95 @@
+import { Link } from 'lib/lemon-ui/Link'
+import { Tooltip } from 'lib/lemon-ui/Tooltip'
+import BlushingHog from 'public/hedgehog/blushing-hog.png'
+import IconAwsS3 from 'public/services/aws-s3.png'
+import Iconazure from 'public/services/azure.png'
+import IconBigQuery from 'public/services/bigquery.png'
+import IconChargebee from 'public/services/chargebee.png'
+import IconCloudflare from 'public/services/cloudflare.png'
+import IconGoogleCloudStorage from 'public/services/google-cloud-storage.png'
+import IconHubspot from 'public/services/hubspot.png'
+import IconMySQL from 'public/services/mysql.png'
+import IconPostgres from 'public/services/postgres.png'
+import IconSalesforce from 'public/services/salesforce.png'
+import IconSnowflake from 'public/services/snowflake.png'
+import IconMSSQL from 'public/services/sql-azure.png'
+import IconStripe from 'public/services/stripe.png'
+import IconVitally from 'public/services/vitally.png'
+import IconZendesk from 'public/services/zendesk.png'
+import { getDataWarehouseSourceUrl } from 'scenes/data-warehouse/settings/DataWarehouseManagedSourcesTable'
+
+/**
+ * In some cases we don't have the backend telling us what provider we have for blob storage, so we can have some
+ * heuristic to guess, then fallback to a shrugging hedgehog.
+ * @param url
+ */
+export function mapUrlToProvider(url: string): string {
+ if (url.includes('.s3.amazonaws.com')) {
+ return 'aws'
+ } else if (url.startsWith('https://storage.googleapis.com')) {
+ return 'google-cloud'
+ } else if (url.includes('.blob.')) {
+ return 'azure'
+ } else if (url.includes('.r2.cloudflarestorage.com')) {
+ return 'cloudflare-r2'
+ }
+ return 'BlushingHog'
+}
+
+/**
+ * DataWarehouseSourceIcon component to render an icon
+ * @param type
+ * @param size
+ */
+export function DataWarehouseSourceIcon({
+ type,
+ size = 'small',
+}: {
+ type: string
+ size?: 'small' | 'medium'
+}): JSX.Element {
+ const sizePx = size === 'small' ? 30 : 60
+
+ const icon = {
+ Stripe: IconStripe,
+ Hubspot: IconHubspot,
+ Zendesk: IconZendesk,
+ Postgres: IconPostgres,
+ MySQL: IconMySQL,
+ Snowflake: IconSnowflake,
+ aws: IconAwsS3,
+ 'google-cloud': IconGoogleCloudStorage,
+ 'cloudflare-r2': IconCloudflare,
+ azure: Iconazure,
+ Salesforce: IconSalesforce,
+ MSSQL: IconMSSQL,
+ Vitally: IconVitally,
+ BigQuery: IconBigQuery,
+ Chargebee: IconChargebee,
+ BlushingHog: BlushingHog, // fallback, we don't know what this is
+ }[type]
+
+ return (
+
+ refreshSelfManagedTableSchema(item.id)}
+ >
+ Update schema from source
+
+ {
+ LemonDialog.open({
+ title: 'Delete table?',
+ description:
+ 'Table deletion cannot be undone. All views and joins related to this table will be deleted.',
- primaryButton: {
- children: 'Delete',
- status: 'danger',
- onClick: () => {
- deleteSelfManagedTable(item.id)
- },
- },
- secondaryButton: {
- children: 'Cancel',
+ primaryButton: {
+ children: 'Delete',
+ status: 'danger',
+ onClick: () => {
+ deleteSelfManagedTable(item.id)
},
- })
- }}
- >
- Delete
-
-
- )
- },
+ },
+ secondaryButton: {
+ children: 'Cancel',
+ },
+ })
+ }}
+ >
+ Delete
+
+
+ {type}
+
+ Click to view docs + + } + > + +
+
+
+
+ )
+}
diff --git a/frontend/src/scenes/data-warehouse/settings/dataWarehouseSettingsLogic.ts b/frontend/src/scenes/data-warehouse/settings/dataWarehouseSettingsLogic.ts
index c0adf6907c65d..2242bfb47c641 100644
--- a/frontend/src/scenes/data-warehouse/settings/dataWarehouseSettingsLogic.ts
+++ b/frontend/src/scenes/data-warehouse/settings/dataWarehouseSettingsLogic.ts
@@ -7,23 +7,12 @@ import posthog from 'posthog-js'
import { databaseTableListLogic } from 'scenes/data-management/database/databaseTableListLogic'
import { DatabaseSchemaDataWarehouseTable } from '~/queries/schema'
-import { DataWarehouseSettingsTab, ExternalDataSource, ExternalDataSourceSchema } from '~/types'
+import { ExternalDataSource, ExternalDataSourceSchema } from '~/types'
import type { dataWarehouseSettingsLogicType } from './dataWarehouseSettingsLogicType'
const REFRESH_INTERVAL = 10000
-export interface DataWarehouseSource {}
-
-export const humanFriendlyDataWarehouseSettingsTabName = (tab: DataWarehouseSettingsTab): string => {
- switch (tab) {
- case DataWarehouseSettingsTab.Managed:
- return 'Managed'
- case DataWarehouseSettingsTab.SelfManaged:
- return 'Self managed'
- }
-}
-
export const dataWarehouseSettingsLogic = kea+ Click to view docs + + } + > + +