cherry-pick 856e41e with resolved conflicts (#64228)

<!-- PR description tips:
https://www.notion.so/sourcegraph/Write-a-good-pull-request-description-610a7fd3e613496eb76f450db5a49b6e
-->
Cherry pick changes from
https://github.com/sourcegraph/sourcegraph/pull/64227 into release
branch

## Test plan
tested via sg start with both:
- export APPLIANCE_UPDATE_TARGET=http://www.google.com
- export APPLIANCE_MENU_TARGET=http://www.warhammer.com

<!-- REQUIRED; info at
https://docs-legacy.sourcegraph.com/dev/background-information/testing_principles
-->

## Changelog

<!-- OPTIONAL; info at
https://www.notion.so/sourcegraph/Writing-a-changelog-entry-dd997f411d524caabf0d8d38a24a878c
-->

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

@@ -35,7 +35,8 @@ export const createJsContext = ({ sourcegraphBaseUrl }: { sourcegraphBaseUrl: st
         accessTokensExpirationDaysOptions: [7, 14, 30, 60, 90],
         allowSignup: true,
         batchChangesEnabled: true,
-        applianceManaged: false,
+        applianceUpdateTarget: '',
+        applianceMenuTarget: '',
         batchChangesDisableWebhooksWarning: false,
         batchChangesWebhookLogsEnabled: true,
         executorsEnabled: false,

client/web/src/enterprise/site-admin/SiteAdminSidebar.story.tsx

@@ -38,7 +38,7 @@ export const AdminSidebarItems: StoryFn = () => (
                     batchChangesExecutionEnabled={true}
                     batchChangesWebhookLogsEnabled={true}
                     codeInsightsEnabled={true}
-                    applianceManaged={false}
+                    applianceUpdateTarget=""
                     endUserOnboardingEnabled={false}
                 />
                 <SiteAdminSidebar
@@ -49,7 +49,7 @@ export const AdminSidebarItems: StoryFn = () => (
                     batchChangesExecutionEnabled={true}
                     batchChangesWebhookLogsEnabled={true}
                     codeInsightsEnabled={true}
-                    applianceManaged={false}
+                    applianceUpdateTarget=""
                     endUserOnboardingEnabled={false}
                 />
                 <SiteAdminSidebar
@@ -60,7 +60,7 @@ export const AdminSidebarItems: StoryFn = () => (
                     batchChangesExecutionEnabled={false}
                     batchChangesWebhookLogsEnabled={false}
                     codeInsightsEnabled={true}
-                    applianceManaged={false}
+                    applianceUpdateTarget=""
                     endUserOnboardingEnabled={false}
                 />
                 <SiteAdminSidebar
@@ -71,7 +71,7 @@ export const AdminSidebarItems: StoryFn = () => (
                     batchChangesExecutionEnabled={true}
                     batchChangesWebhookLogsEnabled={true}
                     codeInsightsEnabled={false}
-                    applianceManaged={false}
+                    applianceUpdateTarget=""
                     endUserOnboardingEnabled={false}
                 />
             </Grid>

client/web/src/integration/jscontext.ts

@@ -27,7 +27,8 @@ export const createJsContext = ({ sourcegraphBaseUrl }: { sourcegraphBaseUrl: st
     accessTokensExpirationDaysOptions: [7, 30, 60, 90],
     allowSignup: false,
     batchChangesEnabled: true,
-    applianceManaged: false,
+    applianceUpdateTarget: '',
+    applianceMenuTarget: '',
     batchChangesDisableWebhooksWarning: false,
     batchChangesWebhookLogsEnabled: true,
     codeInsightsEnabled: true,

client/web/src/jscontext.ts

@@ -199,7 +199,8 @@ export interface SourcegraphContext extends Pick<Required<SiteConfiguration>, 'e
     /**
      * Whether this sourcegraph instance is managed by Appliance
      */
-    applianceManaged: boolean
+    applianceUpdateTarget: string
+    applianceMenuTarget: string
 
     /**
      * Whether Cody is enabled on this instance. Check

client/web/src/nav/UserNavItem.tsx

@@ -227,6 +227,11 @@ export const UserNavItem: FC<UserNavItemProps> = props => {
                                     Site admin
                                 </MenuLink>
                             )}
+                            {authenticatedUser.siteAdmin && window.context.applianceMenuTarget !== '' && (
+                                <MenuLink as={Link} to={window.context.applianceMenuTarget}>
+                                    Appliance
+                                </MenuLink>
+                            )}
                             <MenuLink as={Link} to="/help" target="_blank" rel="noopener">
                                 Help <Icon aria-hidden={true} svgPath={mdiOpenInNew} />
                             </MenuLink>

client/web/src/routes.tsx

@@ -268,7 +268,7 @@ export const routes: RouteObject[] = [
                         sideBarGroups={props.siteAdminSideBarGroups}
                         overviewComponents={props.siteAdminOverviewComponents}
                         codeInsightsEnabled={window.context.codeInsightsEnabled}
-                        applianceManaged={window.context.applianceManaged}
+                        applianceUpdateTarget={window.context.applianceUpdateTarget}
                         telemetryRecorder={props.platformContext.telemetryRecorder}
                     />
                 )}

client/web/src/site-admin/SiteAdminArea.tsx

@@ -59,7 +59,7 @@ export interface SiteAdminAreaRouteContext
     overviewComponents: readonly React.ComponentType<React.PropsWithChildren<{}>>[]
 
     codeInsightsEnabled: boolean
-    applianceManaged: boolean
+    applianceUpdateTarget: string
 
     endUserOnboardingEnabled: boolean
 }
@@ -78,7 +78,7 @@ interface SiteAdminAreaProps
     authenticatedUser: AuthenticatedUser
     isSourcegraphDotCom: boolean
     codeInsightsEnabled: boolean
-    applianceManaged: boolean
+    applianceUpdateTarget: string
 }
 
 const sourcegraphOperatorSiteAdminMaintenanceBlockItems = new Set([
@@ -144,7 +144,7 @@ const AuthenticatedSiteAdminArea: React.FunctionComponent<React.PropsWithChildre
         telemetryService: props.telemetryService,
         telemetryRecorder: props.telemetryRecorder,
         codeInsightsEnabled: props.codeInsightsEnabled,
-        applianceManaged: props.applianceManaged,
+        applianceUpdateTarget: props.applianceUpdateTarget,
         endUserOnboardingEnabled,
     }
 
@@ -164,7 +164,7 @@ const AuthenticatedSiteAdminArea: React.FunctionComponent<React.PropsWithChildre
                     batchChangesExecutionEnabled={props.batchChangesExecutionEnabled}
                     batchChangesWebhookLogsEnabled={props.batchChangesWebhookLogsEnabled}
                     codeInsightsEnabled={props.codeInsightsEnabled}
-                    applianceManaged={props.applianceManaged}
+                    applianceUpdateTarget={props.applianceUpdateTarget}
                     endUserOnboardingEnabled={endUserOnboardingEnabled}
                 />
                 <div className="flex-bounded">

client/web/src/site-admin/SiteAdminSidebar.tsx

@@ -15,7 +15,7 @@ export interface SiteAdminSideBarGroupContext extends BatchChangesProps {
     isSourcegraphDotCom: boolean
     codeInsightsEnabled: boolean
     endUserOnboardingEnabled: boolean
-    applianceManaged: boolean
+    applianceUpdateTarget: string
 }
 
 export interface SiteAdminSideBarGroup extends NavGroupDescriptor<SiteAdminSideBarGroupContext> {}

client/web/src/site-admin/sidebaritems.ts

@@ -135,12 +135,12 @@ const maintenanceGroup: SiteAdminSideBarGroup = {
         {
             label: maintenanceGroupUpdatesItemLabel,
             to: '/site-admin/updates',
-            condition: ({ applianceManaged }) => !applianceManaged,
+            condition: ({ applianceUpdateTarget }) => applianceUpdateTarget === '',
         },
         {
             label: maintenanceGroupUpdatesItemLabel,
-            to: '/appliance/updates',
-            condition: ({ applianceManaged }) => applianceManaged,
+            to: window.context.applianceUpdateTarget,
+            condition: ({ applianceUpdateTarget }) => applianceUpdateTarget !== '',
         },
         {
             label: 'Documentation',

cmd/frontend/internal/app/jscontext/jscontext.go

@@ -232,14 +232,16 @@ type JSContext struct {
 	CodeIntelAutoIndexingAllowGlobalPolicies       bool `json:"codeIntelAutoIndexingAllowGlobalPolicies"`
 	CodeIntelRankingDocumentReferenceCountsEnabled bool `json:"codeIntelRankingDocumentReferenceCountsEnabled"`
 
-	CodeInsightsEnabled      bool `json:"codeInsightsEnabled"`
-	ApplianceManaged         bool `json:"applianceManaged"`
-	CodeIntelligenceEnabled  bool `json:"codeIntelligenceEnabled"`
-	SearchContextsEnabled    bool `json:"searchContextsEnabled"`
-	NotebooksEnabled         bool `json:"notebooksEnabled"`
-	CodeMonitoringEnabled    bool `json:"codeMonitoringEnabled"`
-	SearchAggregationEnabled bool `json:"searchAggregationEnabled"`
-	OwnEnabled               bool `json:"ownEnabled"`
+	CodeInsightsEnabled      bool   `json:"codeInsightsEnabled"`
+	ApplianceUpdateTarget    string `json:"applianceUpdateTarget"`
+	ApplianceMenuTarget      string `json:"applianceMenuTarget"`
+	CodeIntelligenceEnabled  bool   `json:"codeIntelligenceEnabled"`
+	SearchContextsEnabled    bool   `json:"searchContextsEnabled"`
+	NotebooksEnabled         bool   `json:"notebooksEnabled"`
+	CodeMonitoringEnabled    bool   `json:"codeMonitoringEnabled"`
+	SearchAggregationEnabled bool   `json:"searchAggregationEnabled"`
+	OwnEnabled               bool   `json:"ownEnabled"`
+	SearchJobsEnabled        bool   `json:"searchJobsEnabled"`
 
 	RedirectUnsupportedBrowser bool `json:"RedirectUnsupportedBrowser"`
 
@@ -437,7 +439,8 @@ func NewJSContextFromRequest(req *http.Request, db database.DB) JSContext {
 		CodyRequiresVerifiedEmail: siteResolver.RequiresVerifiedEmailForCody(ctx),
 
 		CodeSearchEnabledOnInstance: codeSearchLicensed,
-		ApplianceManaged:            conf.IsApplianceManaged(),
+		ApplianceUpdateTarget:       conf.ApplianceUpdateTarget(),
+		ApplianceMenuTarget:         conf.ApplianceMenuTarget(),
 
 		ExecutorsEnabled:                               conf.ExecutorsEnabled(),
 		CodeIntelAutoIndexingEnabled:                   conf.CodeIntelAutoIndexingEnabled(),

internal/conf/computed.go

@@ -5,7 +5,6 @@ import (
 	"log" //nolint:logging // TODO move all logging to sourcegraph/log
 	"os"
 	"slices"
-	"strconv"
 	"strings"
 	"time"
 
@@ -443,11 +442,12 @@ func AuthPrimaryLoginProvidersCount() int {
 	return c
 }
 
-func IsApplianceManaged() bool {
-	if v, _ := strconv.ParseBool(os.Getenv("APPLIANCE_MANAGED")); v {
-		return v
-	}
-	return false
+func ApplianceUpdateTarget() string {
+	return os.Getenv("APPLIANCE_UPDATE_TARGET")
+}
+
+func ApplianceMenuTarget() string {
+	return os.Getenv("APPLIANCE_MENU_TARGET")
 }
 
 // SearchSymbolsParallelism returns 20, or the site config