Remove analytics and add more update headers

2026-03-24 02:11:10 +01:00 · 2025-02-24 06:31:49 -08:00
parent af7782c93b
commit 05ac836265
62 changed files with 146 additions and 519 deletions
--- a/src-web/components/LicenseBadge.tsx
+++ b/src-web/components/LicenseBadge.tsx
@@ -60,6 +60,7 @@ export function LicenseBadge() {
      size="2xs"
      variant="border"
      className="!rounded-full mx-1"
+      color={detail.color}
      onClick={async () => {
        if (check.data.type === 'trialing') {
          await setLicenseDetails((v) => ({
@@ -69,8 +70,6 @@ export function LicenseBadge() {
        }
        openSettings.mutate(SettingsTab.License);
      }}
-      color={detail.color}
-      event={{ id: 'license-badge', status: check.data.type }}
    >
      {detail.label}
    </Button>
--- a/src-web/components/MarkdownEditor.tsx
+++ b/src-web/components/MarkdownEditor.tsx
@@ -66,18 +66,8 @@ export function MarkdownEditor({
        onChange={setViewMode}
        value={viewMode}
        options={[
-          {
-            event: { id: 'md_mode', mode: 'preview' },
-            icon: 'eye',
-            label: 'Preview mode',
-            value: 'preview',
-          },
-          {
-            event: { id: 'md_mode', mode: 'edit' },
-            icon: 'pencil',
-            label: 'Edit mode',
-            value: 'edit',
-          },
+          { icon: 'eye', label: 'Preview mode', value: 'preview' },
+          { icon: 'pencil', label: 'Edit mode', value: 'edit' },
        ]}
      />
    </div>
--- a/src-web/components/Settings/SettingsAppearance.tsx
+++ b/src-web/components/Settings/SettingsAppearance.tsx
@@ -96,7 +96,6 @@ export function SettingsAppearance() {
        value={`${settings.interfaceFontSize}`}
        options={fontSizeOptions}
        onChange={(v) => updateSettings.mutate({ interfaceFontSize: parseInt(v) })}
-        event="ui-font-size"
      />
      <Select
        size="sm"
@@ -106,7 +105,6 @@ export function SettingsAppearance() {
        value={`${settings.editorFontSize}`}
        options={fontSizeOptions}
        onChange={(v) => updateSettings.mutate({ editorFontSize: clamp(parseInt(v) || 14, 8, 30) })}
-        event="editor-font-size"
      />
      <Select
        size="sm"
@@ -116,13 +114,11 @@ export function SettingsAppearance() {
        value={`${settings.editorKeymap}`}
        options={keymaps}
        onChange={(v) => updateSettings.mutate({ editorKeymap: v })}
-        event="editor-keymap"
      />
      <Checkbox
        checked={settings.editorSoftWrap}
        title="Wrap Editor Lines"
        onChange={(editorSoftWrap) => updateSettings.mutate({ editorSoftWrap })}
-        event="editor-wrap-lines"
      />

      <Separator className="my-4" />
@@ -134,7 +130,6 @@ export function SettingsAppearance() {
        size="sm"
        value={settings.appearance}
        onChange={(appearance) => updateSettings.mutate({ appearance })}
-        event="appearance"
        options={[
          { label: 'Automatic', value: 'system' },
          { label: 'Light', value: 'light' },
@@ -152,7 +147,6 @@ export function SettingsAppearance() {
            className="flex-1"
            value={activeTheme.light.id}
            options={lightThemes}
-            event="theme.light"
            onChange={(themeLight) => updateSettings.mutate({ ...settings, themeLight })}
          />
        )}
@@ -166,7 +160,6 @@ export function SettingsAppearance() {
            size="sm"
            value={activeTheme.dark.id}
            options={darkThemes}
-            event="theme.dark"
            onChange={(themeDark) => updateSettings.mutate({ ...settings, themeDark })}
          />
        )}
--- a/src-web/components/Settings/SettingsGeneral.tsx
+++ b/src-web/components/Settings/SettingsGeneral.tsx
@@ -38,7 +38,6 @@ export function SettingsGeneral() {
          size="sm"
          value={settings.updateChannel}
          onChange={(updateChannel) => updateSettings.mutate({ updateChannel })}
-          event="update-channel"
          options={[
            { label: 'Stable (less frequent)', value: 'stable' },
            { label: 'Beta (more frequent)', value: 'beta' },
@@ -59,7 +58,6 @@ export function SettingsGeneral() {
        labelPosition="left"
        labelClassName="w-[14rem]"
        size="sm"
-        event="workspace-switch-behavior"
        value={
          settings.openWorkspaceNewWindow === true
            ? 'new'
@@ -81,9 +79,9 @@ export function SettingsGeneral() {

      <Checkbox
        className="mt-3"
-        checked={settings.telemetry}
-        title="Send Usage Statistics"
-        event="usage-statistics"
+        checked={false}
+        title="Send Usage Statistics (all tracking was removed in 2025.1.2)"
+        disabled
        onChange={(telemetry) => updateSettings.mutate({ telemetry })}
      />

@@ -115,7 +113,6 @@ export function SettingsGeneral() {
        <Checkbox
          checked={workspace.settingValidateCertificates}
          title="Validate TLS Certificates"
-          event="validate-certs"
          onChange={(settingValidateCertificates) =>
            upsertWorkspace.mutate({ ...workspace, settingValidateCertificates })
          }
@@ -124,7 +121,6 @@ export function SettingsGeneral() {
        <Checkbox
          checked={workspace.settingFollowRedirects}
          title="Follow Redirects"
-          event="follow-redirects"
          onChange={(settingFollowRedirects) =>
            upsertWorkspace.mutate({
              ...workspace,
--- a/src-web/components/Settings/SettingsLicense.tsx
+++ b/src-web/components/Settings/SettingsLicense.tsx
@@ -81,7 +81,6 @@ export function SettingsLicense() {
            color="secondary"
            size="sm"
            onClick={toggleActivateFormVisible}
-            event="license.another"
          >
            Activate Another License
          </Button>
@@ -90,7 +89,6 @@ export function SettingsLicense() {
            size="sm"
            onClick={() => openUrl('https://yaak.app/dashboard')}
            rightSlot={<Icon icon="external_link" />}
-            event="license.support"
          >
            Direct Support
          </Button>
@@ -101,7 +99,6 @@ export function SettingsLicense() {
            color="primary"
            size="sm"
            onClick={toggleActivateFormVisible}
-            event="license.activate"
          >
            Activate
          </Button>
@@ -110,7 +107,6 @@ export function SettingsLicense() {
            size="sm"
            onClick={() => openUrl('https://yaak.app/pricing?ref=app.yaak.desktop')}
            rightSlot={<Icon icon="external_link" />}
-            event="license.purchase"
          >
            Purchase
          </Button>
@@ -140,7 +136,6 @@ export function SettingsLicense() {
            color="primary"
            size="sm"
            isLoading={activate.isPending}
-            event="license.submit"
          >
            Submit
          </Button>
--- a/src-web/components/Settings/SettingsPlugins.tsx
+++ b/src-web/components/Settings/SettingsPlugins.tsx
@@ -66,7 +66,6 @@ export function SettingsPlugins() {
                type="submit"
                color="primary"
                className="ml-auto"
-                event="plugin.add"
              >
                Add Plugin
              </Button>
@@ -76,14 +75,12 @@ export function SettingsPlugins() {
              icon="refresh"
              title="Reload plugins"
              spin={refreshPlugins.isPending}
-              event="plugin.reload"
              onClick={() => refreshPlugins.mutate()}
            />
            <IconButton
              size="sm"
              icon="help"
              title="View documentation"
-              event="plugin.docs"
              onClick={() => openUrl('https://feedback.yaak.app/help/articles/6911763-quick-start')}
            />
          </HStack>
@@ -107,7 +104,6 @@ function PluginInfo({ plugin }: { plugin: Plugin }) {
          size="sm"
          icon="trash"
          title="Uninstall plugin"
-          event="plugin.delete"
          onClick={() => deletePlugin.mutate()}
        />
      </td>
--- a/src-web/components/Settings/SettingsProxy.tsx
+++ b/src-web/components/Settings/SettingsProxy.tsx
@@ -19,7 +19,6 @@ export function SettingsProxy() {
        hideLabel
        size="sm"
        value={settings.proxy?.type ?? 'automatic'}
-        event="proxy"
        onChange={(v) => {
          if (v === 'automatic') {
            updateSettings.mutate({ proxy: undefined });
--- a/src-web/components/WebsocketRequestPane.tsx
+++ b/src-web/components/WebsocketRequestPane.tsx
@@ -18,7 +18,6 @@ import { requestsAtom } from '../hooks/useRequests';
 import { useRequestUpdateKey } from '../hooks/useRequestUpdateKey';
 import { useUpdateAnyHttpRequest } from '../hooks/useUpdateAnyHttpRequest';
 import { useLatestWebsocketConnection } from '../hooks/useWebsocketConnections';
-import { trackEvent } from '../lib/analytics';
 import { deepEqualAtom } from '../lib/atoms';
 import { languageFromContentType } from '../lib/contentType';
 import { generateId } from '../lib/generateId';
@@ -190,7 +189,6 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
      environmentId: getActiveEnvironment()?.id ?? null,
      cookieJarId: getActiveCookieJar()?.id ?? null,
    });
-    trackEvent('websocket_request', 'send');
  }, [activeRequest.id]);

  const handleSend = useCallback(async () => {
@@ -199,13 +197,11 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
      connectionId: connection?.id,
      environmentId: getActiveEnvironment()?.id ?? null,
    });
-    trackEvent('websocket_connection', 'send');
  }, [connection]);

  const handleCancel = useCallback(async () => {
    if (connection == null) return;
    await closeWebsocket({ connectionId: connection?.id });
-    trackEvent('websocket_connection', 'cancel');
  }, [connection]);

  const handleUrlChange = useCallback(
--- a/src-web/components/WorkspaceHeader.tsx
+++ b/src-web/components/WorkspaceHeader.tsx
@@ -46,7 +46,6 @@ export const WorkspaceHeader = memo(function WorkspaceHeader({ className }: Prop
          icon="search"
          title="Search or execute a command"
          size="sm"
-          event="search"
          iconColor="secondary"
          onClick={togglePalette}
        />
--- a/src-web/components/core/Button.tsx
+++ b/src-web/components/core/Button.tsx
@@ -4,7 +4,6 @@ import type { HTMLAttributes, ReactNode } from 'react';
 import { forwardRef, useImperativeHandle, useRef } from 'react';
 import type { HotkeyAction } from '../../hooks/useHotKey';
 import { useFormattedHotkey, useHotKey } from '../../hooks/useHotKey';
-import { trackEvent } from '../../lib/analytics';
 import { Icon } from './Icon';
 import { LoadingIcon } from './LoadingIcon';

@@ -22,7 +21,6 @@ export type ButtonProps = Omit<HTMLAttributes<HTMLButtonElement>, 'color' | 'onC
  leftSlot?: ReactNode;
  rightSlot?: ReactNode;
  hotkeyAction?: HotkeyAction;
-  event?: string | { id: string; [attr: string]: number | string };
 };

 export const Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button(
@@ -43,7 +41,6 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button
    hotkeyAction,
    title,
    onClick,
-    event,
    ...props
  }: ButtonProps,
  ref,
@@ -107,12 +104,7 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button
      type={type}
      className={classes}
      disabled={disabled}
-      onClick={(e) => {
-        onClick?.(e);
-        if (event != null) {
-          trackEvent('button', 'click', typeof event === 'string' ? { id: event } : event);
-        }
-      }}
+      onClick={onClick}
      onDoubleClick={(e) => {
        // Kind of a hack? This prevents double-clicks from going through buttons. For example, when
        // double-clicking the workspace header to toggle window maximization
--- a/src-web/components/core/Checkbox.tsx
+++ b/src-web/components/core/Checkbox.tsx
@@ -1,6 +1,5 @@
 import classNames from 'classnames';
 import { type ReactNode } from 'react';
-import { trackEvent } from '../../lib/analytics';
 import { Icon } from './Icon';
 import { HStack } from './Stacks';

@@ -13,7 +12,6 @@ export interface CheckboxProps {
  inputWrapperClassName?: string;
  hideLabel?: boolean;
  fullWidth?: boolean;
-  event?: string;
 }

 export function Checkbox({
@@ -25,7 +23,6 @@ export function Checkbox({
  title,
  hideLabel,
  fullWidth,
-  event,
 }: CheckboxProps) {
  return (
    <HStack as="label" space={2} className={classNames(className, 'text-text mr-auto')}>
@@ -42,9 +39,6 @@ export function Checkbox({
          disabled={disabled}
          onChange={() => {
            onChange(checked === 'indeterminate' ? true : !checked);
-            if (event != null) {
-              trackEvent('button', 'click', { id: event, checked: checked ? 'on' : 'off' });
-            }
          }}
        />
        <div className="absolute inset-0 flex items-center justify-center">
--- a/src-web/components/core/Link.tsx
+++ b/src-web/components/core/Link.tsx
@@ -1,15 +1,13 @@
+import { Link as RouterLink } from '@tanstack/react-router';
 import classNames from 'classnames';
 import type { HTMLAttributes } from 'react';
-import { Link as RouterLink } from '@tanstack/react-router';
-import { trackEvent } from '../../lib/analytics';
 import { Icon } from './Icon';

 interface Props extends HTMLAttributes<HTMLAnchorElement> {
  href: string;
-  event?: string;
 }

-export function Link({ href, children, className, event, ...other }: Props) {
+export function Link({ href, children, className, ...other }: Props) {
  const isExternal = href.match(/^https?:\/\//);

  className = classNames(className, 'relative underline hover:text-violet-600');
@@ -23,9 +21,6 @@ export function Link({ href, children, className, event, ...other }: Props) {
        className={classNames(className, 'pr-4 inline-flex items-center')}
        onClick={(e) => {
          e.preventDefault();
-          if (event != null) {
-            trackEvent('link', 'click', { id: event });
-          }
        }}
        {...other}
      >
--- a/src-web/components/core/PairEditor.tsx
+++ b/src-web/components/core/PairEditor.tsx
@@ -261,7 +261,6 @@ export const PairEditor = forwardRef<PairEditorRef, PairEditorProps>(function Pa
          variant="border"
          className="m-2"
          size="xs"
-          event="pairs.reveal-more"
        >
          Show {pairs.length - MAX_INITIAL_PAIRS} More
        </Button>
--- a/src-web/components/core/SegmentedControl.tsx
+++ b/src-web/components/core/SegmentedControl.tsx
@@ -2,18 +2,17 @@ import classNames from 'classnames';
 import { useRef } from 'react';
 import { useStateWithDeps } from '../../hooks/useStateWithDeps';
 import type { IconProps } from './Icon';
-import type { IconButtonProps } from './IconButton';
 import { IconButton } from './IconButton';
 import { HStack } from './Stacks';

 interface Props<T extends string> {
-  options: { value: T; label: string; icon: IconProps['icon']; event?: IconButtonProps['event'] }[];
+  options: { value: T; label: string; icon: IconProps['icon'] }[];
  onChange: (value: T) => void;
  value: T;
  name: string;
 }

-export function SegmentedControl<T extends string>({ value, onChange, options, name }: Props<T>) {
+export function SegmentedControl<T extends string>({ value, onChange, options }: Props<T>) {
  const [selectedValue, setSelectedValue] = useStateWithDeps<T>(value, [value]);
  const containerRef = useRef<HTMLDivElement>(null);
  return (
@@ -45,14 +44,13 @@ export function SegmentedControl<T extends string>({ value, onChange, options, n
          <IconButton
            size="xs"
            variant="solid"
-            color={isActive ? "secondary" : undefined}
+            color={isActive ? 'secondary' : undefined}
            role="radio"
-            event={{ id: name, value: String(o.value) }}
            tabIndex={isSelected ? 0 : -1}
            className={classNames(
-                isActive && '!text-text',
-                '!px-1.5 !w-auto',
-                'focus:ring-border-focus',
+              isActive && '!text-text',
+              '!px-1.5 !w-auto',
+              'focus:ring-border-focus',
            )}
            key={i}
            title={o.label}
--- a/src-web/components/core/Select.tsx
+++ b/src-web/components/core/Select.tsx
@@ -2,7 +2,6 @@ import classNames from 'classnames';
 import type { CSSProperties, ReactNode } from 'react';
 import { useState } from 'react';
 import { useOsInfo } from '../../hooks/useOsInfo';
-import { trackEvent } from '../../lib/analytics';
 import type { ButtonProps } from './Button';
 import { Button } from './Button';
 import { Label } from './Label';
@@ -22,7 +21,6 @@ export interface SelectProps<T extends string> {
  onChange: (value: T) => void;
  size?: ButtonProps['size'];
  className?: string;
-  event?: string;
  disabled?: boolean;
 }

@@ -38,7 +36,6 @@ export function Select<T extends string>({
  leftSlot,
  onChange,
  className,
-  event,
  size = 'md',
 }: SelectProps<T>) {
  const osInfo = useOsInfo();
@@ -48,9 +45,6 @@ export function Select<T extends string>({

  const handleChange = (value: T) => {
    onChange?.(value);
-    if (event != null) {
-      trackEvent('select', 'click', { id: event, value });
-    }
  };

  return (
--- a/src-web/components/core/Tabs/Tabs.tsx
+++ b/src-web/components/core/Tabs/Tabs.tsx
@@ -1,7 +1,6 @@
 import classNames from 'classnames';
 import type { ReactNode } from 'react';
 import { memo, useEffect, useRef } from 'react';
-import { trackEvent } from '../../../lib/analytics';
 import { Icon } from '../Icon';
 import type { RadioDropdownProps } from '../RadioDropdown';
 import { RadioDropdown } from '../RadioDropdown';
@@ -104,14 +103,7 @@ export function Tabs({
                  onChange={t.options.onChange}
                >
                  <button
-                    onClick={
-                      isActive
-                        ? undefined
-                        : () => {
-                            trackEvent('tab', 'click', { label, tab: t.value });
-                            onChangeValue(t.value);
-                          }
-                    }
+                    onClick={isActive ? undefined : () => onChangeValue(t.value)}
                    className={btnClassName}
                  >
                    {option && 'shortLabel' in option && option.shortLabel
@@ -133,14 +125,7 @@ export function Tabs({
              return (
                <button
                  key={t.value}
-                  onClick={
-                    isActive
-                      ? undefined
-                      : () => {
-                          trackEvent('tab', 'click', { label, tab: t.value });
-                          onChangeValue(t.value);
-                        }
-                  }
+                  onClick={isActive ? undefined : () => onChangeValue(t.value)}
                  className={btnClassName}
                >
                  {t.label}
--- a/src-web/components/sidebar/SidebarActions.tsx
+++ b/src-web/components/sidebar/SidebarActions.tsx
@@ -2,7 +2,6 @@ import { useMemo } from 'react';
 import { useFloatingSidebarHidden } from '../../hooks/useFloatingSidebarHidden';
 import { useShouldFloatSidebar } from '../../hooks/useShouldFloatSidebar';
 import { useSidebarHidden } from '../../hooks/useSidebarHidden';
-import { trackEvent } from '../../lib/analytics';
 import { IconButton } from '../core/IconButton';
 import { HStack } from '../core/Stacks';
 import { CreateDropdown } from '../CreateDropdown';
@@ -22,8 +21,6 @@ export function SidebarActions() {
    <HStack className="h-full">
      <IconButton
        onClick={async () => {
-          trackEvent('sidebar', 'toggle');
-
          // NOTE: We're not using the (h) => !h pattern here because the data
          //  might be different if another window changed it (out of sync)
          await setHidden(!hidden);