Revert "fix(plg): Cody Pro routes conditions & add links to the user nav dropdown (#63378) (#63424)

This reverts commit 5cf81e0
(https://github.com/sourcegraph/sourcegraph/pull/63378).

This PR intorduced a call to the SSC backend via proxy on the
Sourcegraph backend (see `cmd/frontend/internal/ssc/ssc_proxy.go`). It
appeared that proxy is not properly configured on dotcom, causing
requests to fail with 503 "proxy not configured" errors.
Reverting this PR until we fix the configuration.

<!-- 💡 To write a useful PR description, make sure that your description
covers:
- WHAT this PR is changing:
    - How was it PREVIOUSLY.
    - How it will be from NOW on.
- WHY this PR is needed.
- CONTEXT, i.e. to which initiative, project or RFC it belongs.

The structure of the description doesn't matter as much as covering
these points, so use
your best judgement based on your context.
Learn how to write good pull request description:
https://www.notion.so/sourcegraph/Write-a-good-pull-request-description-610a7fd3e613496eb76f450db5a49b6e?pvs=4
-->


## Test plan
- CI
<!-- All pull requests REQUIRE a test plan:
https://docs-legacy.sourcegraph.com/dev/background-information/testing_principles
-->


## Changelog

<!--
1. Ensure your pull request title is formatted as: $type($domain): $what
2. Add bullet list items for each additional detail you want to cover
(see example below)
3. You can edit this after the pull request was merged, as long as
release shipping it hasn't been promoted to the public.
4. For more information, please see this how-to
https://www.notion.so/sourcegraph/Writing-a-changelog-entry-dd997f411d524caabf0d8d38a24a878c?

Audience: TS/CSE > Customers > Teammates (in that order).

Cheat sheet: $type = chore|fix|feat $domain:
source|search|ci|release|plg|cody|local|...
-->

<!--
Example:

Title: fix(search): parse quotes with the appropriate context
Changelog section:

## Changelog

- When a quote is used with regexp pattern type, then ...
- Refactored underlying code.
-->

Author: taras-yemets

client/web/BUILD.bazel

@@ -240,7 +240,7 @@ ts_project(
         "src/cody/management/UseCodyInEditorSection.tsx",
         "src/cody/management/api/client.ts",
         "src/cody/management/api/components/CodyProApiClient.ts",
-        "src/cody/management/api/react-query/CodyProApiProvider.tsx",
+        "src/cody/management/api/react-query/QueryClientProvider.tsx",
         "src/cody/management/api/react-query/callCodyProApi.ts",
         "src/cody/management/api/react-query/invites.ts",
         "src/cody/management/api/react-query/queryKeys.ts",

client/web/src/LegacySourcegraphWebApp.tsx

@@ -41,7 +41,6 @@ import { WildcardThemeContext, type WildcardTheme } from '@sourcegraph/wildcard'
 import { authenticatedUser as authenticatedUserSubject, type AuthenticatedUser, authenticatedUserValue } from './auth'
 import { getWebGraphQLClient } from './backend/graphql'
 import { isBatchChangesExecutionEnabled } from './batches'
-import { CodyProApiProvider } from './cody/management/api/react-query/CodyProApiProvider'
 import { ComponentsComposer } from './components/ComponentsComposer'
 import { ErrorBoundary } from './components/ErrorBoundary'
 import { FeatureFlagsLocalOverrideAgent } from './featureFlags/FeatureFlagsProvider'
@@ -261,7 +260,6 @@ export class LegacySourcegraphWebApp extends React.Component<StaticAppConfig, Le
                     <SearchResultsCacheProvider />,
                     <SearchQueryStateStoreProvider useSearchQueryState={useNavbarQueryState} />,
                     <LegacyRouteContextProvider context={legacyContext} />,
-                    <CodyProApiProvider isSourcegraphDotCom={window.context.sourcegraphDotComMode} />,
                     /* eslint-enable react/no-children-prop, react/jsx-key */
                 ]}
             >

client/web/src/SourcegraphWebApp.tsx

@@ -29,7 +29,6 @@ import type { TelemetryV2Props } from '@sourcegraph/shared/src/telemetry'
 import { WildcardThemeContext, type WildcardTheme } from '@sourcegraph/wildcard'
 
 import { authenticatedUser as authenticatedUserSubject, type AuthenticatedUser, authenticatedUserValue } from './auth'
-import { CodyProApiProvider } from './cody/management/api/react-query/CodyProApiProvider'
 import { ComponentsComposer } from './components/ComponentsComposer'
 import { ErrorBoundary, RouteError } from './components/ErrorBoundary'
 import { FeatureFlagsLocalOverrideAgent } from './featureFlags/FeatureFlagsProvider'
@@ -284,7 +283,6 @@ export const SourcegraphWebApp: FC<SourcegraphWebAppProps> = props => {
                         ...props,
                     }}
                 />,
-                <CodyProApiProvider isSourcegraphDotCom={props.isSourcegraphDotCom} />,
                 /* eslint-enable react/no-children-prop, react/jsx-key */
             ]}
         >

client/web/src/cody/codyProRoutes.tsx

@@ -4,6 +4,7 @@ import { lazyComponent } from '@sourcegraph/shared/src/util/lazyComponent'
 
 import { type LegacyLayoutRouteContext, LegacyRoute } from '../LegacyRouteContext'
 
+import { QueryClientProvider } from './management/api/react-query/QueryClientProvider'
 import { isEmbeddedCodyProUIEnabled } from './util'
 
 export enum CodyProRoutes {
@@ -77,5 +78,9 @@ interface CodyProPageProps extends Pick<LegacyLayoutRouteContext, 'authenticated
  */
 const CodyProPage: React.FC<CodyProPageProps> = props => {
     const Component = routeComponents[props.path]
-    return <Component authenticatedUser={props.authenticatedUser} telemetryRecorder={props.telemetryRecorder} />
+    return (
+        <QueryClientProvider>
+            <Component authenticatedUser={props.authenticatedUser} telemetryRecorder={props.telemetryRecorder} />
+        </QueryClientProvider>
+    )
 }

client/web/src/cody/management/CodyManagementPage.tsx

@@ -175,7 +175,7 @@ export const CodyManagementPage: React.FunctionComponent<CodyManagementPageProps
                                 )}
                             </Text>
                         </div>
-                        {isAdmin && (
+                        {isUserOnProTier && (
                             <div>
                                 <ButtonLink
                                     variant="primary"

client/web/src/cody/management/api/react-query/CodyProApiProvider.tsx

@@ -0,0 +1,20 @@
+import { QueryClient, QueryClientProvider as ReactQueryClientProvider } from '@tanstack/react-query'
+
+// Tweak the default queries and mutations behavior.
+// See defaults here: https://tanstack.com/query/latest/docs/framework/react/guides/important-defaults
+const queryClient = new QueryClient({
+    defaultOptions: {
+        queries: {
+            // If query failed, it's not likely that refetching it will succeed, so don't retry.
+            retry: false,
+        },
+        mutations: {
+            // If query failed, it's not likely that refetching it will succeed, so don't retry.
+            retry: false,
+        },
+    },
+})
+
+export const QueryClientProvider: React.FC<React.PropsWithChildren<{}>> = ({ children }) => (
+    <ReactQueryClientProvider client={queryClient}>{children}</ReactQueryClientProvider>
+)

client/web/src/cody/management/api/react-query/QueryClientProvider.tsx

@@ -20,7 +20,7 @@ import type { LegacyLayoutRouteContext } from '../../../../LegacyRouteContext'
 import { CodyProRoutes } from '../../../codyProRoutes'
 import { PageHeaderIcon } from '../../../components/PageHeaderIcon'
 import { USER_CODY_PLAN } from '../../../subscription/queries'
-import { useCurrentSubscription, useSubscriptionSummary } from '../../api/react-query/subscriptions'
+import { useCurrentSubscription } from '../../api/react-query/subscriptions'
 
 import { InvoiceHistory } from './InvoiceHistory'
 import { PaymentDetails } from './PaymentDetails'
@@ -38,7 +38,6 @@ const AuthenticatedCodySubscriptionManagePage: React.FC<Props> = ({ telemetryRec
         error: useCodyPlanError,
         data: userCodyPlanData,
     } = useQuery<UserCodyPlanResult, UserCodyPlanVariables>(USER_CODY_PLAN, {})
-    const subscriptionSummaryQuery = useSubscriptionSummary()
 
     useEffect(
         function recordViewEvent() {
@@ -47,7 +46,7 @@ const AuthenticatedCodySubscriptionManagePage: React.FC<Props> = ({ telemetryRec
         [telemetryRecorder]
     )
 
-    if (userCodyPlanLoading || subscriptionSummaryQuery.isLoading) {
+    if (userCodyPlanLoading) {
         return <LoadingSpinner />
     }
 
@@ -56,32 +55,18 @@ const AuthenticatedCodySubscriptionManagePage: React.FC<Props> = ({ telemetryRec
         return null
     }
 
-    if (subscriptionSummaryQuery.isError) {
-        logger.error('Failed to fetch Cody subscription summary', subscriptionSummaryQuery.error)
-        return null
-    }
-
     const subscriptionData = userCodyPlanData?.currentUser?.codySubscription
     if (!subscriptionData) {
         logger.error('Cody subscription data is not available.')
         return null
     }
 
-    if (!subscriptionSummaryQuery.data) {
-        logger.error('Cody subscription summary is not available.')
-        return null
-    }
-
     // This page only applies to users who have a Cody Pro subscription to manage.
     // Otherwise, direct them to the ./new page to sign up.
     if (subscriptionData.plan !== CodySubscriptionPlan.PRO) {
         return <Navigate to={CodyProRoutes.NewProSubscription} replace={true} />
     }
 
-    if (subscriptionSummaryQuery.data.userRole !== 'admin') {
-        return <Navigate to={CodyProRoutes.Manage} replace={true} />
-    }
-
     return (
         <Page className="d-flex flex-column">
             <PageTitle title="Manage subscription" />

client/web/src/cody/management/subscription/manage/CodySubscriptionManagePage.tsx

@@ -9,8 +9,6 @@ import { MockedTestProvider } from '@sourcegraph/shared/src/testing/apollo'
 import { AnchorLink, RouterLink, setLinkComponent } from '@sourcegraph/wildcard'
 import { renderWithBrandedContext } from '@sourcegraph/wildcard/src/testing'
 
-import { CodyProApiProvider } from '../cody/management/api/react-query/CodyProApiProvider'
-
 import { UserNavItem, type UserNavItemProps } from './UserNavItem'
 
 vi.mock('../util/license', () => ({
@@ -58,22 +56,18 @@ describe('UserNavItem', () => {
         emails: [],
     }
 
-    const isSourcegraphDotCom = true
-
     test('simple', () => {
         expect(
             render(
                 <MemoryRouter>
                     <MockedTestProvider>
-                        <CodyProApiProvider isSourcegraphDotCom={isSourcegraphDotCom}>
-                            <UserNavItem
-                                showKeyboardShortcutsHelp={() => undefined}
-                                authenticatedUser={USER}
-                                isSourcegraphDotCom={true}
-                                showFeedbackModal={() => undefined}
-                                telemetryService={NOOP_TELEMETRY_SERVICE}
-                            />
-                        </CodyProApiProvider>
+                        <UserNavItem
+                            showKeyboardShortcutsHelp={() => undefined}
+                            authenticatedUser={USER}
+                            isSourcegraphDotCom={true}
+                            showFeedbackModal={() => undefined}
+                            telemetryService={NOOP_TELEMETRY_SERVICE}
+                        />
                     </MockedTestProvider>
                 </MemoryRouter>
             ).asFragment()
@@ -83,15 +77,13 @@ describe('UserNavItem', () => {
     test('logout click triggers page refresh instead of performing client-side only navigation', async () => {
         const result = renderWithBrandedContext(
             <MockedTestProvider>
-                <CodyProApiProvider isSourcegraphDotCom={isSourcegraphDotCom}>
-                    <UserNavItem
-                        showKeyboardShortcutsHelp={() => undefined}
-                        authenticatedUser={USER}
-                        isSourcegraphDotCom={isSourcegraphDotCom}
-                        showFeedbackModal={() => undefined}
-                        telemetryService={NOOP_TELEMETRY_SERVICE}
-                    />
-                </CodyProApiProvider>
+                <UserNavItem
+                    showKeyboardShortcutsHelp={() => undefined}
+                    authenticatedUser={USER}
+                    isSourcegraphDotCom={true}
+                    showFeedbackModal={() => undefined}
+                    telemetryService={NOOP_TELEMETRY_SERVICE}
+                />
             </MockedTestProvider>
         )
 

client/web/src/nav/UserNavItem.test.tsx

@@ -26,8 +26,6 @@ import {
 } from '@sourcegraph/wildcard'
 
 import type { AuthenticatedUser } from '../auth'
-import { CodyProRoutes } from '../cody/codyProRoutes'
-import { useSubscriptionSummary } from '../cody/management/api/react-query/subscriptions'
 import { enableDevSettings, isSourcegraphDev, useDeveloperSettings } from '../stores'
 
 import { useNewSearchNavigation } from './new-global-navigation'
@@ -132,7 +130,6 @@ export const UserNavItem: FC<UserNavItemProps> = props => {
                             <MenuHeader className={styles.dropdownHeader}>
                                 Signed in as <strong>@{authenticatedUser.username}</strong>
                             </MenuHeader>
-                            {isSourcegraphDotCom && <CodyProSection />}
                             <MenuDivider className={styles.dropdownDivider} />
                             <MenuLink as={Link} to={authenticatedUser.settingsURL!}>
                                 Settings
@@ -244,28 +241,3 @@ export const UserNavItem: FC<UserNavItemProps> = props => {
         </>
     )
 }
-
-const CodyProSection: React.FC = () => {
-    const { data } = useSubscriptionSummary()
-
-    if (!data) {
-        return null
-    }
-
-    return (
-        <>
-            <MenuDivider className={styles.dropdownDivider} />
-            <MenuHeader className={styles.dropdownHeader}>Cody PRO</MenuHeader>
-            <MenuLink as={Link} to={CodyProRoutes.ManageTeam}>
-                Manage team
-            </MenuLink>
-
-            {/* only team admins can manage subscription */}
-            {data.userRole === 'admin' && (
-                <MenuLink as={Link} to={CodyProRoutes.SubscriptionManage}>
-                    Manage subscription
-                </MenuLink>
-            )}
-        </>
-    )
-}