From 9eba337d93ad539a737420d4081f2c4e5985f915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Tue, 6 Sep 2022 12:51:26 +0200 Subject: [PATCH 01/16] :fire: Remove `identify` from BE --- packages/cli/src/InternalHooks.ts | 1 - packages/cli/src/telemetry/index.ts | 34 +---------------------------- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/packages/cli/src/InternalHooks.ts b/packages/cli/src/InternalHooks.ts index abac63d489edc..882222bad21d3 100644 --- a/packages/cli/src/InternalHooks.ts +++ b/packages/cli/src/InternalHooks.ts @@ -48,7 +48,6 @@ export class InternalHooksClass implements IInternalHooksClass { }; return Promise.all([ - this.telemetry.identify(info), this.telemetry.track('Instance started', { ...info, earliest_workflow_created: earliestWorkflowCreatedAt, diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts index f5e750a4bde38..43824ff7e8a1a 100644 --- a/packages/cli/src/telemetry/index.ts +++ b/packages/cli/src/telemetry/index.ts @@ -138,38 +138,6 @@ export class Telemetry { }); } - async identify(traits?: { - [key: string]: string | number | boolean | object | undefined | null; - }): Promise { - return new Promise((resolve) => { - if (this.postHog) { - this.postHog.identify({ - distinctId: this.instanceId, - properties: { - ...traits, - instanceId: this.instanceId, - }, - }); - } - - if (this.rudderStack) { - this.rudderStack.identify( - { - userId: this.instanceId, - anonymousId: '000000000000', - traits: { - ...traits, - instanceId: this.instanceId, - }, - }, - resolve, - ); - } else { - resolve(); - } - }); - } - async track( eventName: string, properties: ITelemetryTrackProperties = {}, @@ -208,7 +176,7 @@ export class Telemetry { ): Promise { if (!this.postHog) return Promise.resolve(false); - const fullId = [this.instanceId, userId].join('_'); // PostHog disallows # in ID + const fullId = [this.instanceId, userId].join('#'); return this.postHog.isFeatureEnabled(featureFlagName, fullId); } From 592ecb374249f8ea6f60b130708d136918e12e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Tue, 6 Sep 2022 12:52:14 +0200 Subject: [PATCH 02/16] :zap: Add `versionCli` --- packages/editor-ui/src/components/Telemetry.vue | 1 + packages/editor-ui/src/plugins/telemetry/index.ts | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/editor-ui/src/components/Telemetry.vue b/packages/editor-ui/src/components/Telemetry.vue index d8d788785da34..801bf84935036 100644 --- a/packages/editor-ui/src/components/Telemetry.vue +++ b/packages/editor-ui/src/components/Telemetry.vue @@ -43,6 +43,7 @@ export default mixins(externalHooks).extend({ instanceId: this.instanceId, userId: this.currentUserId, store: this.$store, + versionCli: this.$store.getters['settings/versionCli'], }, ); diff --git a/packages/editor-ui/src/plugins/telemetry/index.ts b/packages/editor-ui/src/plugins/telemetry/index.ts index 245c583cf785d..51377ce678cc2 100644 --- a/packages/editor-ui/src/plugins/telemetry/index.ts +++ b/packages/editor-ui/src/plugins/telemetry/index.ts @@ -48,10 +48,11 @@ export class Telemetry { init( telemetrySettings: ITelemetrySettings, - { instanceId, userId, store }: { + { instanceId, userId, store, versionCli }: { instanceId: string; userId?: string; store: Store; + versionCli: string }, ) { if (!telemetrySettings.enabled || !telemetrySettings.config || this.rudderStack) return; @@ -74,14 +75,14 @@ export class Telemetry { }, ); - this.identify(instanceId, userId); + this.identify(instanceId, userId, versionCli); this.flushPageEvents(); this.track('Session started', { session_id: store.getters.sessionId }); } - identify(instanceId: string, userId?: string) { - const traits = { instance_id: instanceId }; + identify(instanceId: string, userId?: string, versionCli?: string) { + const traits = { instance_id: instanceId, version_cli: versionCli }; if (userId) { this.rudderStack.identify(`${instanceId}#${userId}`, traits); } From b0159f1afb630d38d6a2bfbb6139d148b28c0062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Tue, 6 Sep 2022 13:35:35 +0200 Subject: [PATCH 03/16] :zap: Add node creator ignore input --- packages/editor-ui/src/components/NodeCreator/SearchBar.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/editor-ui/src/components/NodeCreator/SearchBar.vue b/packages/editor-ui/src/components/NodeCreator/SearchBar.vue index 4d007a591f0cb..ce6c3d700fbea 100644 --- a/packages/editor-ui/src/components/NodeCreator/SearchBar.vue +++ b/packages/editor-ui/src/components/NodeCreator/SearchBar.vue @@ -5,6 +5,7 @@
Date: Tue, 6 Sep 2022 13:35:57 +0200 Subject: [PATCH 04/16] :zap: Move obfuscators to editor-ui --- .../src/components/N8nUserInfo/UserInfo.vue | 2 +- packages/editor-ui/src/components/CopyInput.vue | 5 +---- .../editor-ui/src/components/CredentialsList.vue | 5 +---- packages/editor-ui/src/components/ExecutionsList.vue | 12 ++++-------- packages/editor-ui/src/components/ExpressionEdit.vue | 4 ++-- packages/editor-ui/src/components/MainSidebar.vue | 7 +------ packages/editor-ui/src/components/Node.vue | 2 +- packages/editor-ui/src/components/ParameterInput.vue | 2 +- packages/editor-ui/src/components/RunData.vue | 4 +++- packages/editor-ui/src/components/Sticky.vue | 5 +---- .../src/components/VariableSelectorItem.vue | 10 +--------- packages/editor-ui/src/components/WorkflowOpen.vue | 6 +----- .../editor-ui/src/views/SettingsPersonalView.vue | 6 +----- 13 files changed, 19 insertions(+), 51 deletions(-) diff --git a/packages/design-system/src/components/N8nUserInfo/UserInfo.vue b/packages/design-system/src/components/N8nUserInfo/UserInfo.vue index e6acb476ea312..313fcf5267162 100644 --- a/packages/design-system/src/components/N8nUserInfo/UserInfo.vue +++ b/packages/design-system/src/components/N8nUserInfo/UserInfo.vue @@ -1,6 +1,6 @@