Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit 7ec61a0

Browse files
taras-yemetstaras-yemets
committed
Merge remote-tracking branch 'origin/main' into ty/add-cody-pro-links-to-user-nav
2 parents 3424ebb + 2395dd6 commit 7ec61a0

File tree

207 files changed

+2225
-7273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+2225
-7273
lines changed

‎.eslintrc.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,6 @@ const config = {
257257
message:
258258
'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.',
259259
},
260-
{
261-
selector: 'JSXSpreadAttribute[argument.name=/^(props|rest)$/]',
262-
message:
263-
"Spreading props can be unsafe. Prefer destructuring the props object, or continue only if you're sure.",
264-
},
265260
{
266261
selector: 'ImportDeclaration[source.value="react-router"]',
267262
message:

‎client/shared/src/auth.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ export const currentAuthStateQuery = gql`
4242
viewerCanAdminister
4343
tosAccepted
4444
hasVerifiedEmail
45-
completedPostSignup
4645
emails {
4746
email
4847
verified

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export class TelemetryEmitter {
6363
}
6464

6565
try {
66-
sourcegraph.logTelemetryEvent(`codeintel.${action + xrepo ? '.xrepo' : ''}`, {
66+
sourcegraph.logTelemetryEvent(`codeintel.${action + (xrepo ? '.xrepo' : '')}`, {
6767
...args,
6868
durationMs: this.elapsed(),
6969
languageId: this.languageID,
@@ -75,6 +75,9 @@ export class TelemetryEmitter {
7575
durationMs: this.elapsed(),
7676
repositoryId: this.repoID,
7777
},
78+
privateMetadata: {
79+
languageId: this.languageID,
80+
},
7881
})
7982
} catch {
8083
// Older version of Sourcegraph may have not registered this

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ export interface TemporarySettingsSchema {
9393
'admin.hasCompletedLicenseCheck': boolean
9494
'simple.search.toggle': boolean
9595
'cody.onboarding.completed': boolean
96-
'cody.onboarding.step': number
9796

9897
/** OpenCodeGraph */
9998
'openCodeGraph.annotations.visible': boolean
@@ -161,7 +160,6 @@ const TEMPORARY_SETTINGS: Record<keyof TemporarySettings, null> = {
161160
'admin.hasCompletedLicenseCheck': null,
162161
'simple.search.toggle': null,
163162
'cody.onboarding.completed': null,
164-
'cody.onboarding.step': null,
165163
'openCodeGraph.annotations.visible': null,
166164
}
167165

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ export const enum EventName {
1515
CODY_CHAT_SCOPE_INFERRED_REPO_DISABLED = 'web:codyChat:inferredRepoDisabled',
1616
CODY_CHAT_SCOPE_INFERRED_FILE_ENABLED = 'web:codyChat:inferredFileEnabled',
1717
CODY_CHAT_SCOPE_INFERRED_FILE_DISABLED = 'web:codyChat:inferredFileDisabled',
18-
VIEW_GET_CODY = 'GetCody',
1918

2019
CODY_EDITOR_WIDGET_VIEWED = 'web:codyEditorWidget:viewed',
2120
CODY_SIDEBAR_CHAT_OPENED = 'web:codySidebar:chatOpened',

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ export const currentUserMock = {
2121
emails: [{ email: 'felix@sourcegraph.com', isPrimary: true, verified: true }],
2222
latestSettings: null,
2323
hasVerifiedEmail: true,
24-
completedPostSignup: true,
2524
permissions: {
2625
__typename: 'PermissionConnection',
2726
nodes: [

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@
9292
},
9393
'.cm-tooltip': {
9494
border: 'none',
95+
// For nice rounded corners in hover cards
96+
borderRadius: 'var(--border-radius)',
9597
},
9698
})
9799

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,10 @@ const topLevelPaths = [
3333
'search/cody',
3434
'app',
3535
'cody',
36-
'get-cody',
3736
'post-sign-up',
3837
'unlock-account',
3938
'password-reset',
4039
'survey',
41-
'welcome',
4240
'embed',
4341
'users',
4442
'user',

‎client/web-sveltekit/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export default defineConfig(({ mode }) => {
7979
proxy: {
8080
// Proxy requests to specific endpoints to a real Sourcegraph
8181
// instance.
82-
'^(/sign-in|/.assets|/-|/.api|/search/stream|/users|/notebooks|/insights|/batch-changes)|/-/(raw|compare|own|embeddings|code-graph|batch-changes|settings)(/|$)':
82+
'^(/sign-in|/.assets|/-|/.api|/search/stream|/users|/notebooks|/insights|/batch-changes)|/-/(raw|compare|own|code-graph|batch-changes|settings)(/|$)':
8383
{
8484
target: process.env.SOURCEGRAPH_API_URL || 'https://sourcegraph.com',
8585
changeOrigin: true,

‎client/web/BUILD.bazel

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,6 @@ ts_project(
228228
"src/cody/components/ScopeSelector/index.tsx",
229229
"src/cody/components/ScopeSelector/useRepoSuggestions.ts",
230230
"src/cody/dashboard/CodyDashboardPage.tsx",
231-
"src/cody/dashboard/UpsellImage.tsx",
232-
"src/cody/editorGroups.ts",
233231
"src/cody/invites/AcceptInviteBanner.tsx",
234232
"src/cody/invites/InviteUsers.tsx",
235233
"src/cody/invites/useInviteParams.ts",
@@ -264,17 +262,6 @@ ts_project(
264262
"src/cody/management/subscription/manage/utils.ts",
265263
"src/cody/management/subscription/new/CodyProCheckoutForm.tsx",
266264
"src/cody/management/subscription/new/NewCodyProSubscriptionPage.tsx",
267-
"src/cody/onboarding/CodyOnboarding.tsx",
268-
"src/cody/onboarding/EditorStep.tsx",
269-
"src/cody/onboarding/PurposeStep.tsx",
270-
"src/cody/onboarding/WelcomeStep.tsx",
271-
"src/cody/onboarding/instructions/CodyFeatures.tsx",
272-
"src/cody/onboarding/instructions/JetBrains.tsx",
273-
"src/cody/onboarding/instructions/NeoVim.tsx",
274-
"src/cody/onboarding/instructions/VsCode.tsx",
275-
"src/cody/search/CodySearchPage.tsx",
276-
"src/cody/search/api.ts",
277-
"src/cody/search/translateToQuery.ts",
278265
"src/cody/sidebar/CodySidebar.tsx",
279266
"src/cody/sidebar/Provider.tsx",
280267
"src/cody/sidebar/index.tsx",
@@ -736,10 +723,6 @@ ts_project(
736723
"src/enterprise/codeintel/sort.ts",
737724
"src/enterprise/codeintel/useCodeIntel.ts",
738725
"src/enterprise/codeintel/useSearchBasedCodeIntel.ts",
739-
"src/enterprise/cody/configuration/components/EmptyPoliciesList.tsx",
740-
"src/enterprise/cody/configuration/pages/CodyConfigurationPage.tsx",
741-
"src/enterprise/cody/repo/CodyRepoArea.tsx",
742-
"src/enterprise/cody/repo/CodyRepoSidebar.tsx",
743726
"src/enterprise/dotcom/productSubscriptions/AccountName.tsx",
744727
"src/enterprise/dotcom/productSubscriptions/ProductLicenseValidity.tsx",
745728
"src/enterprise/dotcom/productSubscriptions/ProductSubscriptionLabel.tsx",
@@ -1070,9 +1053,6 @@ ts_project(
10701053
"src/enterprise/site-admin/UserManagement/backend.ts",
10711054
"src/enterprise/site-admin/UserManagement/components/RoleAssignmentModal.tsx",
10721055
"src/enterprise/site-admin/backend.ts",
1073-
"src/enterprise/site-admin/cody/RepoEmbeddingJobNode.tsx",
1074-
"src/enterprise/site-admin/cody/SiteAdminCodyPage.tsx",
1075-
"src/enterprise/site-admin/cody/backend.ts",
10761056
"src/enterprise/site-admin/dotcom/customers/SiteAdminCustomersPage.tsx",
10771057
"src/enterprise/site-admin/dotcom/productSubscriptions/CodyGatewayRateLimitModal.tsx",
10781058
"src/enterprise/site-admin/dotcom/productSubscriptions/CodyServicesSection.tsx",
@@ -1114,7 +1094,6 @@ ts_project(
11141094
"src/fuzzyFinder/SearchValue.ts",
11151095
"src/fuzzyFinder/SearchValueRankingCache.ts",
11161096
"src/fuzzyFinder/WordSensitiveFuzzySearch.ts",
1117-
"src/get-cody/GetCodyPage.tsx",
11181097
"src/global/GlobalAlert.tsx",
11191098
"src/global/GlobalAlerts.tsx",
11201099
"src/global/Notices.tsx",
@@ -1137,7 +1116,6 @@ ts_project(
11371116
"src/marketing/components/TweetFeedback.tsx",
11381117
"src/marketing/page/SurveyForm.tsx",
11391118
"src/marketing/page/SurveyPage.tsx",
1140-
"src/marketing/toast/CodySurveyToast.tsx",
11411119
"src/marketing/toast/SurveySuccessToast.tsx",
11421120
"src/marketing/toast/SurveyToastContent.tsx",
11431121
"src/marketing/toast/SurveyToastTrigger.tsx",
@@ -1392,7 +1370,6 @@ ts_project(
13921370
"src/repo/releases/RepositoryReleasesTagsPage.tsx",
13931371
"src/repo/repoContainerRoutes.tsx",
13941372
"src/repo/repoRevisionContainerRoutes.tsx",
1395-
"src/repo/repoRevisionSidebar/cody/backend.tsx",
13961373
"src/repo/settings/RepoSettingsArea.tsx",
13971374
"src/repo/settings/RepoSettingsIndexPage.tsx",
13981375
"src/repo/settings/RepoSettingsMirrorPage.tsx",

0 commit comments

Comments
 (0)