Merge remote-tracking branch 'origin/main' into ty/add-cody-pro-links-to-user-nav

Author: taras-yemets

.eslintrc.js

@@ -257,11 +257,6 @@ const config = {
         message:
           'Prefer using the <Tooltip> component with an <Input> directly, when possible. Please only use <InputTooltip> when the legacy styling it provides is needed. We will be working to fix style issues with <Input> (especially for checkboxes) in the future.',
       },
-      {
-        selector: 'JSXSpreadAttribute[argument.name=/^(props|rest)$/]',
-        message:
-          "Spreading props can be unsafe. Prefer destructuring the props object, or continue only if you're sure.",
-      },
       {
         selector: 'ImportDeclaration[source.value="react-router"]',
         message:

client/shared/src/auth.ts

@@ -42,7 +42,6 @@ export const currentAuthStateQuery = gql`
             viewerCanAdminister
             tosAccepted
             hasVerifiedEmail
-            completedPostSignup
             emails {
                 email
                 verified

client/shared/src/codeintel/legacy-extensions/telemetry.ts

@@ -63,7 +63,7 @@ export class TelemetryEmitter {
         }
 
         try {
-            sourcegraph.logTelemetryEvent(`codeintel.${action + xrepo ? '.xrepo' : ''}`, {
+            sourcegraph.logTelemetryEvent(`codeintel.${action + (xrepo ? '.xrepo' : '')}`, {
                 ...args,
                 durationMs: this.elapsed(),
                 languageId: this.languageID,
@@ -75,6 +75,9 @@ export class TelemetryEmitter {
                     durationMs: this.elapsed(),
                     repositoryId: this.repoID,
                 },
+                privateMetadata: {
+                    languageId: this.languageID,
+                },
             })
         } catch {
             // Older version of Sourcegraph may have not registered this

client/shared/src/settings/temporary/TemporarySettings.ts

@@ -93,7 +93,6 @@ export interface TemporarySettingsSchema {
     'admin.hasCompletedLicenseCheck': boolean
     'simple.search.toggle': boolean
     'cody.onboarding.completed': boolean
-    'cody.onboarding.step': number
 
     /** OpenCodeGraph */
     'openCodeGraph.annotations.visible': boolean
@@ -161,7 +160,6 @@ const TEMPORARY_SETTINGS: Record<keyof TemporarySettings, null> = {
     'admin.hasCompletedLicenseCheck': null,
     'simple.search.toggle': null,
     'cody.onboarding.completed': null,
-    'cody.onboarding.step': null,
     'openCodeGraph.annotations.visible': null,
 }
 

client/shared/src/telemetry/event-names.ts

@@ -15,7 +15,6 @@ export const enum EventName {
     CODY_CHAT_SCOPE_INFERRED_REPO_DISABLED = 'web:codyChat:inferredRepoDisabled',
     CODY_CHAT_SCOPE_INFERRED_FILE_ENABLED = 'web:codyChat:inferredFileEnabled',
     CODY_CHAT_SCOPE_INFERRED_FILE_DISABLED = 'web:codyChat:inferredFileDisabled',
-    VIEW_GET_CODY = 'GetCody',
 
     CODY_EDITOR_WIDGET_VIEWED = 'web:codyEditorWidget:viewed',
     CODY_SIDEBAR_CHAT_OPENED = 'web:codySidebar:chatOpened',

client/shared/src/testing/integration/graphQlResults.ts

@@ -21,7 +21,6 @@ export const currentUserMock = {
     emails: [{ email: '[email protected]', isPrimary: true, verified: true }],
     latestSettings: null,
     hasVerifiedEmail: true,
-    completedPostSignup: true,
     permissions: {
         __typename: 'PermissionConnection',
         nodes: [

client/web-sveltekit/src/lib/CodeMirrorBlob.svelte

@@ -92,6 +92,8 @@
         },
         '.cm-tooltip': {
             border: 'none',
+            // For nice rounded corners in hover cards
+            borderRadius: 'var(--border-radius)',
         },
     })
 

client/web-sveltekit/src/params/reporev.ts

@@ -33,12 +33,10 @@ const topLevelPaths = [
     'search/cody',
     'app',
     'cody',
-    'get-cody',
     'post-sign-up',
     'unlock-account',
     'password-reset',
     'survey',
-    'welcome',
     'embed',
     'users',
     'user',

client/web-sveltekit/vite.config.ts

@@ -79,7 +79,7 @@ export default defineConfig(({ mode }) => {
             proxy: {
                 // Proxy requests to specific endpoints to a real Sourcegraph
                 // instance.
-                '^(/sign-in|/.assets|/-|/.api|/search/stream|/users|/notebooks|/insights|/batch-changes)|/-/(raw|compare|own|embeddings|code-graph|batch-changes|settings)(/|$)':
+                '^(/sign-in|/.assets|/-|/.api|/search/stream|/users|/notebooks|/insights|/batch-changes)|/-/(raw|compare|own|code-graph|batch-changes|settings)(/|$)':
                     {
                         target: process.env.SOURCEGRAPH_API_URL || 'https://sourcegraph.com',
                         changeOrigin: true,

client/web/BUILD.bazel

@@ -228,8 +228,6 @@ ts_project(
         "src/cody/components/ScopeSelector/index.tsx",
         "src/cody/components/ScopeSelector/useRepoSuggestions.ts",
         "src/cody/dashboard/CodyDashboardPage.tsx",
-        "src/cody/dashboard/UpsellImage.tsx",
-        "src/cody/editorGroups.ts",
         "src/cody/invites/AcceptInviteBanner.tsx",
         "src/cody/invites/InviteUsers.tsx",
         "src/cody/invites/useInviteParams.ts",
@@ -264,17 +262,6 @@ ts_project(
         "src/cody/management/subscription/manage/utils.ts",
         "src/cody/management/subscription/new/CodyProCheckoutForm.tsx",
         "src/cody/management/subscription/new/NewCodyProSubscriptionPage.tsx",
-        "src/cody/onboarding/CodyOnboarding.tsx",
-        "src/cody/onboarding/EditorStep.tsx",
-        "src/cody/onboarding/PurposeStep.tsx",
-        "src/cody/onboarding/WelcomeStep.tsx",
-        "src/cody/onboarding/instructions/CodyFeatures.tsx",
-        "src/cody/onboarding/instructions/JetBrains.tsx",
-        "src/cody/onboarding/instructions/NeoVim.tsx",
-        "src/cody/onboarding/instructions/VsCode.tsx",
-        "src/cody/search/CodySearchPage.tsx",
-        "src/cody/search/api.ts",
-        "src/cody/search/translateToQuery.ts",
         "src/cody/sidebar/CodySidebar.tsx",
         "src/cody/sidebar/Provider.tsx",
         "src/cody/sidebar/index.tsx",
@@ -736,10 +723,6 @@ ts_project(
         "src/enterprise/codeintel/sort.ts",
         "src/enterprise/codeintel/useCodeIntel.ts",
         "src/enterprise/codeintel/useSearchBasedCodeIntel.ts",
-        "src/enterprise/cody/configuration/components/EmptyPoliciesList.tsx",
-        "src/enterprise/cody/configuration/pages/CodyConfigurationPage.tsx",
-        "src/enterprise/cody/repo/CodyRepoArea.tsx",
-        "src/enterprise/cody/repo/CodyRepoSidebar.tsx",
         "src/enterprise/dotcom/productSubscriptions/AccountName.tsx",
         "src/enterprise/dotcom/productSubscriptions/ProductLicenseValidity.tsx",
         "src/enterprise/dotcom/productSubscriptions/ProductSubscriptionLabel.tsx",
@@ -1070,9 +1053,6 @@ ts_project(
         "src/enterprise/site-admin/UserManagement/backend.ts",
         "src/enterprise/site-admin/UserManagement/components/RoleAssignmentModal.tsx",
         "src/enterprise/site-admin/backend.ts",
-        "src/enterprise/site-admin/cody/RepoEmbeddingJobNode.tsx",
-        "src/enterprise/site-admin/cody/SiteAdminCodyPage.tsx",
-        "src/enterprise/site-admin/cody/backend.ts",
         "src/enterprise/site-admin/dotcom/customers/SiteAdminCustomersPage.tsx",
         "src/enterprise/site-admin/dotcom/productSubscriptions/CodyGatewayRateLimitModal.tsx",
         "src/enterprise/site-admin/dotcom/productSubscriptions/CodyServicesSection.tsx",
@@ -1114,7 +1094,6 @@ ts_project(
         "src/fuzzyFinder/SearchValue.ts",
         "src/fuzzyFinder/SearchValueRankingCache.ts",
         "src/fuzzyFinder/WordSensitiveFuzzySearch.ts",
-        "src/get-cody/GetCodyPage.tsx",
         "src/global/GlobalAlert.tsx",
         "src/global/GlobalAlerts.tsx",
         "src/global/Notices.tsx",
@@ -1137,7 +1116,6 @@ ts_project(
         "src/marketing/components/TweetFeedback.tsx",
         "src/marketing/page/SurveyForm.tsx",
         "src/marketing/page/SurveyPage.tsx",
-        "src/marketing/toast/CodySurveyToast.tsx",
         "src/marketing/toast/SurveySuccessToast.tsx",
         "src/marketing/toast/SurveyToastContent.tsx",
         "src/marketing/toast/SurveyToastTrigger.tsx",
@@ -1392,7 +1370,6 @@ ts_project(
         "src/repo/releases/RepositoryReleasesTagsPage.tsx",
         "src/repo/repoContainerRoutes.tsx",
         "src/repo/repoRevisionContainerRoutes.tsx",
-        "src/repo/repoRevisionSidebar/cody/backend.tsx",
         "src/repo/settings/RepoSettingsArea.tsx",
         "src/repo/settings/RepoSettingsIndexPage.tsx",
         "src/repo/settings/RepoSettingsMirrorPage.tsx",