Skip to content

Commit

Permalink
chore: ensure Jan's Posthog does not refresh UUID
Browse files Browse the repository at this point in the history
  • Loading branch information
louis-menlo committed Jan 29, 2025
1 parent 0108020 commit 90904e3
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 2 deletions.
1 change: 1 addition & 0 deletions core/src/types/config/appConfigEntity.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export type AppConfiguration = {
data_folder: string
quick_ask: boolean
distinct_id?: string
}
14 changes: 12 additions & 2 deletions web/containers/Layout/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import ImportModelOptionModal from '@/screens/Settings/ImportModelOptionModal'
import ImportingModelModal from '@/screens/Settings/ImportingModelModal'
import SelectingModelModal from '@/screens/Settings/SelectingModelModal'

import { getAppDistinctId, updateDistinctId } from '@/utils/settings'

import LoadingModal from '../LoadingModal'

import MainViewContainer from '../MainViewContainer'
Expand Down Expand Up @@ -93,8 +95,16 @@ const BaseLayout = () => {
return properties
},
})
posthog.opt_in_capturing()
posthog.register({ app_version: VERSION })
// Attempt to restore distinct Id from app global settings
getAppDistinctId()
.then((id) => {
if (id) posthog.identify(id)
})
.finally(() => {
posthog.opt_in_capturing()
posthog.register({ app_version: VERSION })
updateDistinctId(posthog.get_distinct_id())
})
} else {
posthog.opt_out_capturing()
}
Expand Down
1 change: 1 addition & 0 deletions web/hooks/useFactoryReset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export default function useFactoryReset() {
const configuration: AppConfiguration = {
data_folder: defaultJanDataFolder,
quick_ask: appConfiguration?.quick_ask ?? false,
distinct_id: appConfiguration?.distinct_id,
}
await window.core?.api?.updateAppConfiguration(configuration)
}
Expand Down
22 changes: 22 additions & 0 deletions web/utils/settings.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { AppConfiguration } from '@janhq/core'

/**
* Update app distinct Id
* @param id
*/
export const updateDistinctId = async (id: string) => {
const appConfiguration: AppConfiguration =
await window.core?.api?.getAppConfigurations()
appConfiguration.distinct_id = id
await window.core?.api?.updateAppConfiguration(appConfiguration)
}

/**
* Retrieve app distinct Id
* @param id
*/
export const getAppDistinctId = async (): Promise<string | undefined> => {
const appConfiguration: AppConfiguration =
await window.core?.api?.getAppConfigurations()
return appConfiguration.distinct_id
}

0 comments on commit 90904e3

Please sign in to comment.