diff --git a/client/browser/src/integration/github.test.ts b/client/browser/src/integration/github.test.ts index b2843b0ee654..b344caf39401 100644 --- a/client/browser/src/integration/github.test.ts +++ b/client/browser/src/integration/github.test.ts @@ -52,8 +52,8 @@ describe('GitHub', () => { }) testContext.overrideGraphQL({ - ViewerConfiguration: () => ({ - viewerConfiguration: { + ViewerSettings: () => ({ + viewerSettings: { subjects: [], merged: { contents: '', messages: [] }, }, @@ -158,8 +158,8 @@ describe('GitHub', () => { // extensions: extensionSettings, // } // testContext.overrideGraphQL({ - // ViewerConfiguration: () => ({ - // viewerConfiguration: { + // ViewerSettings: () => ({ + // viewerSettings: { // subjects: [ // { // __typename: 'User', @@ -321,8 +321,8 @@ describe('GitHub', () => { extensions: extensionSettings, } testContext.overrideGraphQL({ - ViewerConfiguration: () => ({ - viewerConfiguration: { + ViewerSettings: () => ({ + viewerSettings: { subjects: [ { __typename: 'User', @@ -643,8 +643,8 @@ describe('GitHub', () => { extensions: extensionSettings, } testContext.overrideGraphQL({ - ViewerConfiguration: () => ({ - viewerConfiguration: { + ViewerSettings: () => ({ + viewerSettings: { subjects: [ { __typename: 'User', diff --git a/client/browser/src/integration/gitlab.test.ts b/client/browser/src/integration/gitlab.test.ts index 9fd6bf87a2a0..d0c8c87d9b05 100644 --- a/client/browser/src/integration/gitlab.test.ts +++ b/client/browser/src/integration/gitlab.test.ts @@ -47,8 +47,8 @@ describe('GitLab', () => { }) testContext.overrideGraphQL({ - ViewerConfiguration: () => ({ - viewerConfiguration: { + ViewerSettings: () => ({ + viewerSettings: { subjects: [], merged: { contents: '', messages: [] }, }, @@ -152,8 +152,8 @@ describe('GitLab', () => { extensions: extensionSettings, } testContext.overrideGraphQL({ - ViewerConfiguration: () => ({ - viewerConfiguration: { + ViewerSettings: () => ({ + viewerSettings: { subjects: [ { __typename: 'User', diff --git a/client/browser/src/shared/platform/settings.ts b/client/browser/src/shared/platform/settings.ts index d2fcc1dd4ac3..a2e957bad782 100644 --- a/client/browser/src/shared/platform/settings.ts +++ b/client/browser/src/shared/platform/settings.ts @@ -14,7 +14,7 @@ import { } from '@sourcegraph/shared/src/settings/settings' import { observeStorageKey, storage } from '../../browser-extension/web-extension-api/storage' -import type { ViewerConfigurationResult } from '../../graphql-operations' +import type { ViewerSettingsResult } from '../../graphql-operations' import { isInPage } from '../context' const inPageClientSettingsKey = 'sourcegraphClientSettings' @@ -35,7 +35,8 @@ function observeLocalStorageKey(key: string, defaultValue: string): Observable Observable = () => { - /** Observable of the JSONC string of the settings. + /** + * Observable of the JSONC string of the settings. * * NOTE: We can't use LocalStorageSubject here because the JSONC string is stored raw in localStorage and LocalStorageSubject also does parsing. * This could be changed, but users already have settings stored, so it would need a migration for little benefit. @@ -95,9 +96,8 @@ export function mergeCascades( } } -// This is a fragment on the DEPRECATED GraphQL API type ConfigurationCascade (not SettingsCascade) for backcompat. -const configurationCascadeFragment = gql` - fragment ConfigurationCascadeFields on ConfigurationCascade { +const settingsCascadeFragment = gql` + fragment SettingsCascadeFields on SettingsCascade { subjects { __typename ...OrgSettingFields @@ -167,42 +167,40 @@ const configurationCascadeFragment = gql` /** * Fetches the settings cascade for the viewer. - * - * TODO(sqs): This uses the DEPRECATED GraphQL Query.viewerConfiguration and ConfigurationCascade for backcompat. */ export function fetchViewerSettings(requestGraphQL: PlatformContext['requestGraphQL']): Observable<{ final: string subjects: SettingsSubject[] }> { return from( - requestGraphQL({ + requestGraphQL({ request: gql` - query ViewerConfiguration { - viewerConfiguration { - ...ConfigurationCascadeFields + query ViewerSettings { + viewerSettings { + ...SettingsCascadeFields } } - ${configurationCascadeFragment} + ${settingsCascadeFragment} `, variables: {}, mightContainPrivateInfo: false, }) ).pipe( map(dataOrThrowErrors), - map(({ viewerConfiguration }) => { - if (!viewerConfiguration) { - throw new Error('fetchViewerSettings: empty viewerConfiguration') + map(({ viewerSettings }) => { + if (!viewerSettings) { + throw new Error('fetchViewerSettings: empty viewerSettings') } - for (const subject of viewerConfiguration.subjects) { + for (const subject of viewerSettings.subjects) { // User/org/global settings cannot be edited from the // browser extension (only client settings can). subject.viewerCanAdminister = false } return { - subjects: viewerConfiguration.subjects, - final: viewerConfiguration.merged.contents, + subjects: viewerSettings.subjects, + final: viewerSettings.merged.contents, } }) )