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

Commit 896819f

Browse files
sqssqs
authored
remove disabled web UI code for embeddings (#63432)
Repository embeddings were removed in Feb 2024 as part of the Cody Enterprise GA. They have not been used since. Some Sourcegraph instances still running an older pre-GA version may still rely on Cody Gateway (deployed by us) for embeddings generation, but they do not rely on this UI code at all, so it is safe to remove. No changelog entry needed since this code's UI has been disabled since Feb 2024. ## Test plan Existing tests suffice since this is removing functionality.
1 parent 8b6d4f8 commit 896819f

33 files changed

+55
-1230
lines changed

‎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 & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -736,10 +736,6 @@ ts_project(
736736
"src/enterprise/codeintel/sort.ts",
737737
"src/enterprise/codeintel/useCodeIntel.ts",
738738
"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",
743739
"src/enterprise/dotcom/productSubscriptions/AccountName.tsx",
744740
"src/enterprise/dotcom/productSubscriptions/ProductLicenseValidity.tsx",
745741
"src/enterprise/dotcom/productSubscriptions/ProductSubscriptionLabel.tsx",
@@ -1070,9 +1066,6 @@ ts_project(
10701066
"src/enterprise/site-admin/UserManagement/backend.ts",
10711067
"src/enterprise/site-admin/UserManagement/components/RoleAssignmentModal.tsx",
10721068
"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",
10761069
"src/enterprise/site-admin/dotcom/customers/SiteAdminCustomersPage.tsx",
10771070
"src/enterprise/site-admin/dotcom/productSubscriptions/CodyGatewayRateLimitModal.tsx",
10781071
"src/enterprise/site-admin/dotcom/productSubscriptions/CodyServicesSection.tsx",
@@ -1392,7 +1385,6 @@ ts_project(
13921385
"src/repo/releases/RepositoryReleasesTagsPage.tsx",
13931386
"src/repo/repoContainerRoutes.tsx",
13941387
"src/repo/repoRevisionContainerRoutes.tsx",
1395-
"src/repo/repoRevisionSidebar/cody/backend.tsx",
13961388
"src/repo/settings/RepoSettingsArea.tsx",
13971389
"src/repo/settings/RepoSettingsIndexPage.tsx",
13981390
"src/repo/settings/RepoSettingsMirrorPage.tsx",

‎client/web/dev/utils/create-js-context.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ export const createJsContext = ({ sourcegraphBaseUrl }: { sourcegraphBaseUrl: st
8787
endpoint: ENVIRONMENT_CONFIG.CLIENT_OTEL_EXPORTER_OTLP_ENDPOINT,
8888
},
8989
telemetryRecorder: noOpTelemetryRecorder,
90-
embeddingsEnabled: false,
9190
primaryLoginProvidersCount: 5,
9291
// Site-config overrides default JS context
9392
...siteConfig,

‎client/web/src/cody/components/ScopeSelector/ScopeSelector.module.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,6 @@
114114
.repo-icon {
115115
color: var(--text-disabled);
116116
}
117-
.embedding-icon-no-embeddings {
118-
color: var(--gray-07);
119-
}
120117
}
121118

122119
.not-included-in-context:hover {

‎client/web/src/cody/isCodyEnabled.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ export const isCodyEnabled = (): boolean => {
1010
}
1111

1212
export const isSignInRequiredForCody = (): boolean => !window.context.isAuthenticatedUser
13-
14-
export const isEmbeddingsEnabled = (): boolean => window.context?.codyEnabled && window.context?.embeddingsEnabled

‎client/web/src/enterprise/codeintel/configuration/hooks/queryPolicies.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ export const POLICIES_CONFIGURATION = gql`
2424
$query: String
2525
$forDataRetention: Boolean
2626
$forIndexing: Boolean
27-
$forEmbeddings: Boolean
2827
$first: Int
2928
$after: String
3029
$protected: Boolean
@@ -34,7 +33,6 @@ export const POLICIES_CONFIGURATION = gql`
3433
query: $query
3534
forDataRetention: $forDataRetention
3635
forIndexing: $forIndexing
37-
forEmbeddings: $forEmbeddings
3836
first: $first
3937
after: $after
4038
protected: $protected
@@ -60,7 +58,6 @@ export const queryPolicies = (
6058
query,
6159
forDataRetention,
6260
forIndexing,
63-
forEmbeddings,
6461
after,
6562
protected: varProtected,
6663
}: Partial<CodeIntelligenceConfigurationPoliciesVariables>,
@@ -71,7 +68,6 @@ export const queryPolicies = (
7168
query: query ?? null,
7269
forDataRetention: forDataRetention ?? null,
7370
forIndexing: forIndexing ?? null,
74-
forEmbeddings: forEmbeddings ?? null,
7571
first: first ?? null,
7672
after: after ?? null,
7773
protected: varProtected ?? null,

‎client/web/src/enterprise/codeintel/configuration/hooks/types.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ export const nullPolicy = {
1616
indexingEnabled: false,
1717
indexCommitMaxAgeHours: null,
1818
indexIntermediateCommits: false,
19-
embeddingsEnabled: false,
2019
repository: null,
2120
}
2221

@@ -39,6 +38,5 @@ export const defaultCodeIntelligenceConfigurationPolicyFieldsFragment = gql`
3938
indexingEnabled
4039
indexCommitMaxAgeHours
4140
indexIntermediateCommits
42-
embeddingsEnabled
4341
}
4442
`

‎client/web/src/enterprise/codeintel/configuration/hooks/usePolicyConfigurationById.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ const emptyPolicy: CodeIntelligenceConfigurationPolicyFields = {
4141
indexingEnabled: false,
4242
indexCommitMaxAgeHours: null,
4343
indexIntermediateCommits: false,
44-
embeddingsEnabled: false,
4544
}
4645

4746
export const usePolicyConfigurationByID = (id: string): UsePolicyConfigResult => {

‎client/web/src/enterprise/codeintel/configuration/hooks/useSavePolicyConfiguration.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ const CREATE_POLICY_CONFIGURATION = gql`
1717
$indexingEnabled: Boolean!
1818
$indexCommitMaxAgeHours: Int
1919
$indexIntermediateCommits: Boolean!
20-
$embeddingsEnabled: Boolean!
2120
) {
2221
createCodeIntelligenceConfigurationPolicy(
2322
repository: $repositoryId
@@ -31,7 +30,6 @@ const CREATE_POLICY_CONFIGURATION = gql`
3130
indexingEnabled: $indexingEnabled
3231
indexCommitMaxAgeHours: $indexCommitMaxAgeHours
3332
indexIntermediateCommits: $indexIntermediateCommits
34-
embeddingsEnabled: $embeddingsEnabled
3533
) {
3634
id
3735
}
@@ -51,7 +49,6 @@ const UPDATE_POLICY_CONFIGURATION = gql`
5149
$indexingEnabled: Boolean!
5250
$indexCommitMaxAgeHours: Int
5351
$indexIntermediateCommits: Boolean!
54-
$embeddingsEnabled: Boolean!
5552
) {
5653
updateCodeIntelligenceConfigurationPolicy(
5754
id: $id
@@ -65,7 +62,6 @@ const UPDATE_POLICY_CONFIGURATION = gql`
6562
indexingEnabled: $indexingEnabled
6663
indexCommitMaxAgeHours: $indexCommitMaxAgeHours
6764
indexIntermediateCommits: $indexIntermediateCommits
68-
embeddingsEnabled: $embeddingsEnabled
6965
) {
7066
alwaysNil
7167
}

‎client/web/src/enterprise/codeintel/configuration/pages/CodeIntelConfigurationPage.tsx

Lines changed: 10 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { type FunctionComponent, useCallback, useEffect, useMemo } from 'react'
1+
import React, { useCallback, useEffect, useMemo, type FunctionComponent } from 'react'
22

33
import { useApolloClient } from '@apollo/client'
44
import {
@@ -11,10 +11,9 @@ import {
1111
mdiLock,
1212
mdiPencil,
1313
mdiSourceRepository,
14-
mdiVectorPolyline,
1514
} from '@mdi/js'
1615
import classNames from 'classnames'
17-
import { useNavigate, useLocation } from 'react-router-dom'
16+
import { useLocation, useNavigate } from 'react-router-dom'
1817
import { Subject } from 'rxjs'
1918

2019
import { RepoLink } from '@sourcegraph/shared/src/components/RepoLink'
@@ -69,12 +68,12 @@ export const CodeIntelConfigurationPage: FunctionComponent<CodeIntelConfiguratio
6968
const apolloClient = useApolloClient()
7069
const queryDefaultPoliciesCallback = useCallback(
7170
(args: FilteredConnectionQueryArguments) =>
72-
queryPolicies({ ...args, repository: repo?.id, forEmbeddings: false, protected: true }, apolloClient),
71+
queryPolicies({ ...args, repository: repo?.id, protected: true }, apolloClient),
7372
[queryPolicies, repo?.id, apolloClient]
7473
)
7574
const queryCustomPoliciesCallback = useCallback(
7675
(args: FilteredConnectionQueryArguments) =>
77-
queryPolicies({ ...args, repository: repo?.id, forEmbeddings: false, protected: false }, apolloClient),
76+
queryPolicies({ ...args, repository: repo?.id, protected: false }, apolloClient),
7877
[queryPolicies, repo?.id, apolloClient]
7978
)
8079

@@ -222,44 +221,38 @@ export const CodeIntelConfigurationPage: FunctionComponent<CodeIntelConfiguratio
222221
interface ProtectedPoliciesNodeProps {
223222
node: CodeIntelligenceConfigurationPolicyFields
224223
indexingEnabled?: boolean
225-
domain?: 'scip' | 'embeddings'
226224
}
227225

228226
export interface UnprotectedPoliciesNodeProps {
229227
node: CodeIntelligenceConfigurationPolicyFields
230228
isDeleting: boolean
231229
onDelete: (id: string, name: string) => Promise<void>
232230
indexingEnabled?: boolean
233-
domain?: 'scip' | 'embeddings'
234231
}
235232

236233
type PoliciesNodeProps = ProtectedPoliciesNodeProps | UnprotectedPoliciesNodeProps
237234

238235
export const PoliciesNode: FunctionComponent<React.PropsWithChildren<PoliciesNodeProps>> = ({
239236
node: policy,
240237
indexingEnabled = false,
241-
domain = 'scip',
242238
...props
243239
}) => (
244240
<>
245241
<span className={styles.separator} />
246242

247243
<div className={classNames(styles.name, 'd-flex flex-column')}>
248-
<PolicyDescription policy={policy} indexingEnabled={indexingEnabled} domain={domain} />
244+
<PolicyDescription policy={policy} indexingEnabled={indexingEnabled} />
249245
<RepositoryAndGitObjectDescription policy={policy} />
250246
{policy.indexingEnabled && indexingEnabled && <AutoIndexingDescription policy={policy} />}
251247
{policy.retentionEnabled && <RetentionDescription policy={policy} />}
252-
{policy.embeddingsEnabled && <EmbeddingsDescription policy={policy} />}
253248
</div>
254249

255250
<div className="h-100">
256251
<Link
257252
to={
258253
policy.repository === null
259-
? `/site-admin/${domain === 'scip' ? 'code-graph' : 'embeddings'}/configuration/${policy.id}`
260-
: `/${policy.repository.name}/-/${
261-
domain === 'scip' ? 'code-graph' : 'embeddings'
262-
}/configuration/${policy.id}`
254+
? `/site-admin/code-graph/configuration/${policy.id}`
255+
: `/${policy.repository.name}/-/code-graph/configuration/${policy.id}`
263256
}
264257
>
265258
<Tooltip content="Edit this policy">
@@ -299,31 +292,27 @@ interface PolicyDescriptionProps {
299292
policy: CodeIntelligenceConfigurationPolicyFields
300293
indexingEnabled?: boolean
301294
allowGlobalPolicies?: boolean
302-
domain?: 'scip' | 'embeddings'
303295
}
304296

305297
const PolicyDescription: FunctionComponent<PolicyDescriptionProps> = ({
306298
policy,
307299
indexingEnabled = false,
308300
allowGlobalPolicies = window.context?.codeIntelAutoIndexingAllowGlobalPolicies,
309-
domain = 'scip',
310301
}) => (
311302
<div className={styles.policyDescription}>
312303
<Link
313304
to={
314305
policy.repository === null
315-
? `/site-admin/${domain === 'scip' ? 'code-graph' : 'embeddings'}/configuration/${policy.id}`
316-
: `/${policy.repository.name}/-/${domain === 'scip' ? 'code-graph' : 'embeddings'}/configuration/${
317-
policy.id
318-
}`
306+
? `/site-admin/code-graph/configuration/${policy.id}`
307+
: `/${policy.repository.name}/-/code-graph/configuration/${policy.id}`
319308
}
320309
>
321310
<Text weight="bold" className="mb-0">
322311
{policy.name}
323312
</Text>
324313
</Link>
325314

326-
{!policy.retentionEnabled && !(indexingEnabled && policy.indexingEnabled) && !policy.embeddingsEnabled && (
315+
{!policy.retentionEnabled && !(indexingEnabled && policy.indexingEnabled) && (
327316
<Tooltip content="This policy has no enabled behaviors.">
328317
<Icon
329318
svgPath={mdiCircleOffOutline}
@@ -540,22 +529,3 @@ const RetentionDescription: FunctionComponent<RetentionDescriptionProps> = ({ po
540529
</span>
541530
</div>
542531
)
543-
544-
interface EmbeddingsDescriptionProps {
545-
policy: CodeIntelligenceConfigurationPolicyFields
546-
}
547-
548-
const EmbeddingsDescription: FunctionComponent<EmbeddingsDescriptionProps> = ({ policy }) => (
549-
<div>
550-
<Tooltip content="This policy affects embeddings.">
551-
<Icon
552-
svgPath={mdiVectorPolyline}
553-
inline={true}
554-
aria-label="This policy affects embeddings."
555-
className="mr-2"
556-
/>
557-
</Tooltip>
558-
559-
<span>Maintains embeddings.</span>
560-
</div>
561-
)

0 commit comments

Comments
 (0)