From d2ae12c60f1b48e85226d3997fc0b2cd4c70bb89 Mon Sep 17 00:00:00 2001 From: Mike Date: Wed, 11 Sep 2024 11:00:01 +0200 Subject: [PATCH] Feat: Added server_id to workspace mixpanel profile (#2937) * Added server_id to workspace profile * Change synta * Check if billng exists before adding it * Simplify code * Only add server_id if client --- .../lib/workspaces/composables/mixpanel.ts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/frontend-2/lib/workspaces/composables/mixpanel.ts b/packages/frontend-2/lib/workspaces/composables/mixpanel.ts index 0052e89a9..7fe64833e 100644 --- a/packages/frontend-2/lib/workspaces/composables/mixpanel.ts +++ b/packages/frontend-2/lib/workspaces/composables/mixpanel.ts @@ -5,6 +5,7 @@ import type { WorkspaceMixpanelUpdateGroup_WorkspaceCollaboratorFragment } from '~/lib/common/generated/gql/graphql' import { Roles, type WorkspaceRoles } from '@speckle/shared' +import { resolveMixpanelServerId } from '@speckle/shared' graphql(` fragment WorkspaceMixpanelUpdateGroup_WorkspaceCollaborator on WorkspaceCollaborator { @@ -64,13 +65,19 @@ export const useWorkspacesMixpanel = () => { domainBasedMembershipProtectionEnabled: workspace.domainBasedMembershipProtectionEnabled, discoverabilityEnabled: workspace.discoverabilityEnabled, - costTotal: workspace.billing?.cost.total, - versionsCountCurrent: workspace.billing?.versionsCount.current, - versionsCountMax: workspace.billing?.versionsCount.max, teamTotalCount: workspace.team.totalCount, teamAdminCount: roleCount[Roles.Workspace.Admin], teamMemberCount: roleCount[Roles.Workspace.Member], - teamGuestCount: roleCount[Roles.Workspace.Guest] + teamGuestCount: roleCount[Roles.Workspace.Guest], + ...(import.meta.client && { + // eslint-disable-next-line camelcase + server_id: resolveMixpanelServerId(window.location.hostname) + }), + ...(workspace.billing && { + costTotal: workspace.billing.cost.total, + versionsCountCurrent: workspace.billing.versionsCount.current, + versionsCountMax: workspace.billing.versionsCount.max + }) } mixpanel.get_group('workspace_id', workspace.id).set(input)