Allow to force usage of pre-defined endpoint

sourcegraph · Jan 9, 2025 · cb8addf · cb8addf
1 parent 3f908ae
commit cb8addf
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 536 deletions.
diff --git a/vscode/src/chat/chat-view/ChatController.ts b/vscode/src/chat/chat-view/ChatController.ts
@@ -551,6 +551,7 @@ export class ChatController implements vscode.Disposable, vscode.WebviewViewProv
             webviewType,
             multipleWebviewsEnabled: !sidebarViewOnly,
             internalDebugContext: configuration.internalDebugContext,
+            allowEndpointChange: configuration.overrideServerEndpoint === undefined,
         }
     }
 

diff --git a/vscode/src/chat/protocol.ts b/vscode/src/chat/protocol.ts
@@ -253,6 +253,7 @@ export interface ConfigurationSubsetForWebview
     // Whether support running multiple webviews (e.g. sidebar w/ multiple editor panels).
     multipleWebviewsEnabled?: boolean | undefined | null
     endpointHistory?: string[] | undefined | null
+    allowEndpointChange: boolean
 }
 
 /**

diff --git a/vscode/webviews/App.story.tsx b/vscode/webviews/App.story.tsx
@@ -30,6 +30,7 @@ const dummyVSCodeAPI: VSCodeWrapper = {
                 experimentalNoodle: false,
                 smartApply: false,
                 hasEditCapability: false,
+                allowEndpointChange: true,
             },
             clientCapabilities: CLIENT_CAPABILITIES_FIXTURE,
             authStatus: {

diff --git a/vscode/webviews/App.tsx b/vscode/webviews/App.tsx
@@ -193,6 +193,7 @@ export const App: React.FunctionComponent<{ vscodeAPI: VSCodeWrapper }> = ({ vsc
                         codyIDE={config.clientCapabilities.agentIDE}
                         endpoints={config.config.endpointHistory ?? []}
                         authStatus={config.authStatus}
+                        allowEndpointChange={config.config.allowEndpointChange}
                     />
                 </div>
             ) : (

diff --git a/vscode/webviews/AuthPage.tsx b/vscode/webviews/AuthPage.tsx
@@ -20,6 +20,7 @@ interface LoginProps {
     codyIDE: CodyIDE
     endpoints: string[]
     authStatus: AuthStatus
+    allowEndpointChange: boolean
 }
 
 interface SignInButtonProps {
@@ -38,9 +39,10 @@ export const AuthPage: React.FunctionComponent<React.PropsWithoutRef<LoginProps>
     uiKindIsWeb,
     vscodeAPI,
     authStatus,
+    allowEndpointChange,
 }) => {
     const telemetryRecorder = useTelemetryRecorder()
-    const [isEnterpriseSignin, setIsEnterpriseSignin] = useState(false)
+    const [isEnterpriseSignin, setIsEnterpriseSignin] = useState(!allowEndpointChange)
 
     // Extracted common button props and styles
     const commonButtonProps = {
@@ -127,25 +129,28 @@ export const AuthPage: React.FunctionComponent<React.PropsWithoutRef<LoginProps>
         () => (
             <section className="tw-bg-sidebar-background tw-text-sidebar-foreground tw-w-full tw-max-w-md">
                 <div className="tw-font-semibold tw-text-md tw-my-4 tw-text-muted-foreground">
-                    <Button
-                        onClick={() => setIsEnterpriseSignin(false)}
-                        className="tw-flex tw-justify-between"
-                        variant="ghost"
-                        title="Back to sign-in options list"
-                    >
-                        <ArrowLeftIcon className="tw-mr-3" size={16} />
-                        Back
-                    </Button>
+                    {allowEndpointChange && (
+                        <Button
+                            onClick={() => setIsEnterpriseSignin(false)}
+                            className="tw-flex tw-justify-between"
+                            variant="ghost"
+                            title="Back to sign-in options list"
+                        >
+                            <ArrowLeftIcon className="tw-mr-3" size={16} />
+                            Back
+                        </Button>
+                    )}
                     <ClientSignInForm
                         authStatus={authStatus}
                         vscodeAPI={vscodeAPI}
                         className="tw-mt-8"
                         telemetryRecorder={telemetryRecorder}
+                        allowEndpointChange={allowEndpointChange}
                     />
                 </div>
             </section>
         ),
-        [authStatus, vscodeAPI, telemetryRecorder]
+        [authStatus, vscodeAPI, telemetryRecorder, allowEndpointChange]
     )
 
     return (
@@ -265,6 +270,7 @@ const WebLogin: React.FunctionComponent<
 interface ClientSignInFormProps {
     vscodeAPI: VSCodeWrapper
     telemetryRecorder: TelemetryRecorder
+    allowEndpointChange: boolean
     authStatus?: AuthStatus
     className?: string
 }
@@ -273,7 +279,7 @@ interface ClientSignInFormProps {
  * The form allows users to input their Sourcegraph instance URL and access token manually.
  */
 const ClientSignInForm: React.FC<ClientSignInFormProps> = memo(
-    ({ className, authStatus, vscodeAPI, telemetryRecorder }) => {
+    ({ className, authStatus, vscodeAPI, telemetryRecorder, allowEndpointChange }) => {
         // Combine related state into a single object to reduce re-renders
         const [formState, setFormState] = useState({
             showAccessTokenField: false,
@@ -354,6 +360,7 @@ const ClientSignInForm: React.FC<ClientSignInFormProps> = memo(
                             className="tw-w-full tw-my-2 !tw-p-4"
                             required
                             onChange={handleInputChange}
+                            disabled={!allowEndpointChange}
                         />
                         <FormMessage match="typeMismatch">Invalid URL.</FormMessage>
                         <FormMessage match="valueMissing">URL is required.</FormMessage>

diff --git a/vscode/webviews/CodyPanel.tsx b/vscode/webviews/CodyPanel.tsx
@@ -19,7 +19,7 @@ import { useClientActionDispatcher } from './client/clientState'
 import { Notices } from './components/Notices'
 import { StateDebugOverlay } from './components/StateDebugOverlay'
 import { TabContainer, TabRoot } from './components/shadcn/ui/tabs'
-import { AccountTab, HistoryTab, PromptsTab, SettingsTab, TabsBar, View } from './tabs'
+import { HistoryTab, PromptsTab, SettingsTab, TabsBar, View } from './tabs'
 import type { VSCodeWrapper } from './utils/VSCodeApi'
 import { useUserAccountInfo } from './utils/useConfig'
 import { useFeatureFlag } from './utils/useFeatureFlags'
@@ -155,15 +155,6 @@ export const CodyPanel: FunctionComponent<CodyPanelProps> = ({
                             isPromptsV2Enabled={isPromptsV2Enabled}
                         />
                     )}
-                    {view === View.Account && (
-                        <AccountTab
-                            config={config}
-                            clientCapabilities={clientCapabilities}
-                            authStatus={authStatus}
-                            isDotComUser={isDotComUser}
-                            userProductSubscription={userProductSubscription}
-                        />
-                    )}
                     {view === View.Settings && <SettingsTab />}
                 </TabContainer>
                 <StateDebugOverlay />

diff --git a/vscode/webviews/components/AccountSwitcher.tsx b/vscode/webviews/components/AccountSwitcher.tsx