Skip to content

Commit

Permalink
Enable schema specific syncs during the onboarding wizard
Browse files Browse the repository at this point in the history
  • Loading branch information
Gilbert09 committed Apr 24, 2024
1 parent 8c299f1 commit 90a4fd7
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,31 @@ import { useValues } from 'kea'
import { sourceWizardLogic } from 'scenes/data-warehouse/new/sourceWizardLogic'
import { dataWarehouseSettingsLogic } from 'scenes/data-warehouse/settings/dataWarehouseSettingsLogic'

import { ExternalDataSourceSchema } from '~/types'

export const SyncProgressStep = (): JSX.Element => {
const { databaseSchema, sourceId } = useValues(sourceWizardLogic)
const { sourceId } = useValues(sourceWizardLogic)
const { dataWarehouseSources, dataWarehouseSourcesLoading } = useValues(dataWarehouseSettingsLogic)

const source = dataWarehouseSources?.results.find((n) => n.id === sourceId)
const schemas = source?.schemas ?? []

const getSyncStatus = (shouldSync: boolean): { status: string; tagType: LemonTagType } => {
if (!shouldSync) {
const getSyncStatus = (schema: ExternalDataSourceSchema): { status: string; tagType: LemonTagType } => {
if (!schema.should_sync) {
return {
status: 'Not synced',
tagType: 'default',
}
}

if (!source || source.status === 'Running') {
if (schema.status === 'Running') {
return {
status: 'Syncing...',
tagType: 'primary',
}
}

if (source.status === 'Completed') {
if (schema.status === 'Completed') {
return {
status: 'Completed',
tagType: 'success',
Expand All @@ -42,22 +45,22 @@ export const SyncProgressStep = (): JSX.Element => {
<div>
<LemonTable
emptyState="No schemas selected"
dataSource={databaseSchema}
dataSource={schemas}
loading={dataWarehouseSourcesLoading}
disableTableWhileLoading={false}
columns={[
{
title: 'Table',
key: 'table',
render: function RenderTable(_, schema) {
return schema.table
return schema.name
},
},
{
title: 'Status',
key: 'status',
render: function RenderStatus(_, schema) {
const { status, tagType } = getSyncStatus(schema.should_sync)
const { status, tagType } = getSyncStatus(schema)

return <LemonTag type={tagType}>{status}</LemonTag>
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,7 @@ export const sourceWizardLogic = kea<sourceWizardLogicType>([
lemonToast.success('New Data Resource Created')
actions.setSourceId(id)
actions.resetSourceConnectionDetails()
actions.loadSources(null)
actions.onNext()
} catch (e: any) {
lemonToast.error(e.data?.message ?? e.message)
Expand Down
4 changes: 2 additions & 2 deletions posthog/warehouse/api/external_data_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ def database_schema(self, request: Request, *arg: Any, **kwargs: Any):
},
)

result_mapped_to_options = [{"table": row, "should_sync": False} for row in result]
result_mapped_to_options = [{"table": row, "should_sync": True} for row in result]
return Response(status=status.HTTP_200_OK, data=result_mapped_to_options)

# Return the possible endpoints for all other source types
Expand All @@ -455,7 +455,7 @@ def database_schema(self, request: Request, *arg: Any, **kwargs: Any):
data={"message": "Invalid parameter: source_type"},
)

options = [{"table": row, "should_sync": False} for row in schemas]
options = [{"table": row, "should_sync": True} for row in schemas]
return Response(status=status.HTTP_200_OK, data=options)

@action(methods=["POST"], detail=False)
Expand Down

0 comments on commit 90a4fd7

Please sign in to comment.