Revert "Merge branch 'main' into ak/update-hubspot-cookie-mapping"

This reverts commit bd5d16f, reversing
changes made to 48a0e3c.

.github/workflows/scip-typescript.yml

@@ -39,7 +39,6 @@ jobs:
         run: |
           curl -L https://sourcegraph.com/.api/src-cli/src_linux_amd64 -o /usr/local/bin/src
           chmod +x /usr/local/bin/src
-    
       - name: Upload SCIP to Cloud
         run: src code-intel upload -github-token='${{ secrets.GITHUB_TOKEN }}' -no-progress
         env:
@@ -51,7 +50,13 @@ jobs:
         env:
           SRC_ENDPOINT: https://sourcegraph.sourcegraph.com/
           SRC_ACCESS_TOKEN: ${{ secrets.SRC_ACCESS_TOKEN_S2 }}
-
+
+      - name: Upload SCIP to Dogfood
+        run: src code-intel upload -github-token='${{ secrets.GITHUB_TOKEN }}' -no-progress || true
+        env:
+          SRC_ENDPOINT: https://k8s.sgdev.org/
+          SRC_ACCESS_TOKEN: ${{ secrets.SRC_ACCESS_TOKEN_DOGFOOD }}
+
       - name: Upload SCIP to Demo
         run: src code-intel upload -github-token='${{ secrets.GITHUB_TOKEN }}' -no-progress || true
         env:

CHANGELOG.md

@@ -21,9 +21,7 @@ All notable changes to Sourcegraph are documented in this file.
 
 ### Fixed
 
-- Fix a bug that caused Bedrock Provisioned Throughput model names to fail [#62695](https://github.com/sourcegraph/sourcegraph/pull/62695) ~~[#62642](https://github.com/sourcegraph/sourcegraph/pull/62642)~~
-- Pressing the numpad `Enter` key will now cycle through in-file search results [#62665](https://github.com/sourcegraph/sourcegraph/pull/62665)
-- Fixed an issue where code graph configuration policies would miscategorize lightweight tags as branches. [#62671](https://github.com/sourcegraph/sourcegraph/pull/62671)
+- Fix a bug that caused Bedrock Provisioned Throughput model names to fail [#62642](https://github.com/sourcegraph/sourcegraph/pull/62642)
 
 ## 5.4.0
 

client/branded/src/search-ui/results/sidebar/SearchReference.tsx

@@ -281,7 +281,7 @@ See [language definition](https://sourcegraph.com/docs/code_search/reference/lan
         ...createQueryExampleFromString('{golang-duration-value}'),
         field: FilterType.timeout,
         description:
-            'Customizes the timeout for searches. The value of the parameter is a string that can be parsed by the [Go time package’s `ParseDuration`](https://golang.org/pkg/time/#ParseDuration) (e.g. 10s, 100ms). By default, the timeout is set to 1 minute, and the search will optimize for returning results as soon as possible. The value of [`search.limits.maxTimeoutSeconds`](https://sourcegraph.com/docs/code-search/types/exhaustive#timeouts) can be configured by site admins. When provided, the search is given the full timeout to complete.',
+            'Customizes the timeout for searches. The value of the parameter is a string that can be parsed by the [Go time package’s `ParseDuration`](https://golang.org/pkg/time/#ParseDuration) (e.g. 10s, 100ms). By default, the timeout is set to 10 seconds, and the search will optimize for returning results as soon as possible. The timeout value cannot be set longer than 1 minute. When provided, the search is given the full timeout to complete.',
         examples: ['repo:^github.com/sourcegraph timeout:15s func count:10000'],
     },
     {

client/web-sveltekit/src/lib/TreeNode.svelte

@@ -1,14 +1,7 @@
 <svelte:options immutable />
 
-<script lang="ts" context="module">
-    interface TreeNodeContext {
-        level: number
-    }
-</script>
-
 <script lang="ts" generics="T">
-    import { createEventDispatcher, getContext, setContext } from 'svelte'
-    import { mdiChevronDown, mdiChevronRight, mdiImageFilterCenterFocusStrong } from '@mdi/js'
+    import { mdiChevronDown, mdiChevronRight } from '@mdi/js'
 
     import Icon from '$lib/Icon.svelte'
     import { Button } from '$lib/wildcard'
@@ -17,8 +10,6 @@
     import { updateTreeState, type TreeProvider, TreeStateUpdate } from './TreeView'
     import { getTreeContext } from './TreeView.svelte'
 
-    const dispatch = createEventDispatcher<{ 'scope-change': { provider: TreeProvider<T> } }>()
-
     export let entry: T
     export let treeProvider: TreeProvider<T>
 
@@ -31,10 +22,8 @@
     $: selectable = treeProvider.isSelectable(entry)
     $: selected = $treeState.selected === nodeID
     $: tabindex = $treeState.focused === nodeID ? 0 : -1
-    $: children = expandable && expanded ? treeProvider.fetchChildren(entry) : null
 
-    let level = getContext<TreeNodeContext>('tree-node-nesting')?.level ?? 0
-    setContext('tree-node-nesting', { level: level + 1 })
+    $: children = expandable && expanded ? treeProvider.fetchChildren(entry) : null
 
     function toggleOpen(expand?: boolean) {
         if (expandable) {
@@ -46,14 +35,6 @@
         }
     }
 
-    function handleScopeChange(event: Event) {
-        event.stopPropagation()
-
-        treeProvider.fetchChildren(entry).then(childTreeProvider => {
-            dispatch('scope-change', { provider: childTreeProvider })
-        })
-    }
-
     $: if (selected && label) {
         const container = label.closest('[role="tree"]')
         if (container) {
@@ -77,17 +58,10 @@
     {tabindex}
     data-treeitem
     data-node-id={nodeID}
-    style="--tree-node-nested-level: {level}"
 >
     <span bind:this={label} class="label" data-treeitem-label>
         <!-- hide the open/close button to preserve alignment with expandable entries -->
-        <span class="expandable-icon-container" class:hidden={!expandable}>
-            <span class="scope-container">
-                <Button variant="icon" on:click={handleScopeChange}>
-                    <Icon svgPath={mdiImageFilterCenterFocusStrong} inline />
-                </Button>
-            </span>
-
+        <span class:hidden={!expandable}>
             <!-- We have to stop even propagation because the tree root listens for click events for
                  selecting items. We don't want the item to be selected when the open/close button is pressed.
              -->
@@ -112,7 +86,7 @@
         {:then treeProvider}
             <ul role="group">
                 {#each treeProvider.getEntries() as entry (treeProvider.getNodeID(entry))}
-                    <svelte:self {entry} {treeProvider} let:entry let:toggle let:expanded on:scope-change>
+                    <svelte:self {entry} {treeProvider} let:entry let:toggle let:expanded>
                         <slot {entry} {toggle} {expanded} />
                     </svelte:self>
                 {/each}
@@ -125,8 +99,8 @@
 
 <style lang="scss">
     [role='treeitem'] {
-        --tree-node-left-padding: 0.35rem;
-
+        // Margin ensures that focus rings are not covered by preceeding or following elements
+        margin: 0.25rem 0;
         border-radius: var(--border-radius);
 
         &[tabindex='0']:focus {
@@ -136,67 +110,19 @@
                 box-shadow: var(--focus-box-shadow);
             }
         }
-
-        :global([data-tree-view-flat-list='false']) & {
-            --tree-node-left-padding: 1.25rem;
-        }
     }
 
+    [role='group'],
     .loading {
-        // Indent with two rem since loading represents next nested level
-        margin-left: calc(var(--tree-node-nested-level) * 1.25rem + 1.15rem + var(--tree-node-left-padding));
-        margin-top: 0.25rem;
+        margin-left: 1rem;
     }
 
     .label {
-        position: relative;
         display: flex;
-        gap: 0.25rem;
         align-items: center;
-        padding-right: 0.25rem;
-        padding-left: calc(var(--tree-node-nested-level) * 1.25rem + var(--tree-node-left-padding));
-
-        // Change icon color based on selected item state
-        --icon-fill-color: var(--tree-node-expand-icon-color);
-        color: var(--tree-node-label-color, var(--text-body));
-
-        li[data-treeitem][aria-selected='true'] > & {
-            color: var(--tree-node-label-color, var(--body-bg));
-        }
-
-        .scope-container {
-            display: none;
-        }
-
-        &:hover,
-        &:focus {
-            .scope-container {
-                display: flex;
-            }
-        }
-    }
-
-    .expandable-icon-container {
-        // in order to center/align expandable icon exactly by the item center
-        display: flex;
-        flex-shrink: 0;
-    }
-
-    .scope-container {
-        position: absolute;
-        left: 0.2rem;
-        height: min-content;
-        display: flex;
     }
 
     .hidden {
         visibility: hidden;
-
-        // If we're in the flat list we can omit expand icon rendering
-        // since none of items is expandable, hence there aren't any offsets
-        :global([data-tree-view-flat-list='true']) & {
-            width: 0;
-            margin-left: 0.5rem;
-        }
     }
 </style>

client/web-sveltekit/src/lib/TreeView.svelte

@@ -1,7 +1,6 @@
 <svelte:options immutable />
 
 <script lang="ts" context="module">
-    import type { Writable } from 'svelte/store'
     import { setContext as setContextSvelte, getContext as getContextSvelte } from 'svelte'
 
     import { updateTreeState, type TreeState, TreeStateUpdate } from './TreeView'
@@ -19,6 +18,7 @@
 
 <script lang="ts" generics="N">
     import { createEventDispatcher } from 'svelte'
+    import type { Writable } from 'svelte/store'
     import { Key } from 'ts-key-enum'
 
     import TreeNode from './TreeNode.svelte'
@@ -35,7 +35,7 @@
         treeRoot?.querySelector('[aria-selected="true"] [data-treeitem-label]')?.scrollIntoView({ block: position })
     }
 
-    const dispatch = createEventDispatcher<{ select: HTMLElement; 'scope-change': TreeProvider<N> }>()
+    const dispatch = createEventDispatcher<{ select: HTMLElement }>()
 
     let treeState = getTreeContext()
     let treeRoot: HTMLElement
@@ -234,24 +234,17 @@
         }
     }
 
-    $: entries = treeProvider.getEntries() ?? []
-    $: isFlatList = entries.find(entry => treeProvider.isExpandable(entry)) === undefined
+    $: entries = treeProvider.getEntries()
 
     // Make first tree item focusable if none is selected/focused
     $: if (!$treeState.focused && entries.length > 0) {
         $treeState = { ...$treeState, focused: treeProvider.getNodeID(entries[0]) }
     }
 </script>
 
-<ul
-    role="tree"
-    bind:this={treeRoot}
-    on:keydown={handleKeydown}
-    on:click={handleClick}
-    data-tree-view-flat-list={isFlatList}
->
+<ul bind:this={treeRoot} role="tree" on:keydown={handleKeydown} on:click={handleClick}>
     {#each entries as entry (treeProvider.getNodeID(entry))}
-        <TreeNode {entry} {treeProvider} on:scope-change>
+        <TreeNode {entry} {treeProvider}>
             <svelte:fragment let:entry let:toggle let:expanded>
                 <slot {entry} {toggle} {expanded} />
             </svelte:fragment>
@@ -264,13 +257,13 @@
 
 <style lang="scss">
     ul {
-        padding: 0;
+        // Padding ensures that focus rings of tree items are not cut off
+        padding: 0 0.25rem;
 
         &,
         :global(ul[role='group']) {
-            margin: 0;
-            overflow: hidden;
             list-style: none;
+            margin: 0;
         }
 
         :global(ul[role='group']) {

client/web-sveltekit/src/lib/fuzzyfinder/FuzzyFinder.svelte

@@ -1,13 +1,3 @@
-<script lang="ts" context="module">
-    export enum FuzzyFinderTabType {
-        Repos = 'repos',
-        Symbols = 'symbols',
-        Files = 'files',
-    }
-
-    export type FuzzyFinderTabId = FuzzyFinderTabType | `${FuzzyFinderTabType}`
-</script>
-
 <script lang="ts">
     import { mdiClose } from '@mdi/js'
     import { tick } from 'svelte'
@@ -38,7 +28,7 @@
     export let open = false
     export let scope = ''
 
-    export function selectTab(tabID: FuzzyFinderTabId) {
+    export function selectTab(tabID: 'repos' | 'symbols' | 'files') {
         if (selectedTab.id !== tabID) {
             selectedOption = 0
             selectedTab = tabs.find(t => t.id === tabID) ?? tabs[0]

client/web-sveltekit/src/lib/fuzzyfinder/FuzzyFinderContainer.svelte

@@ -1,19 +1,3 @@
-<script lang="ts" context="module">
-    import { writable } from 'svelte/store'
-    import type { FuzzyFinderTabId } from './FuzzyFinder.svelte'
-
-    interface FuzzyFinderState {
-        open: boolean
-        selectedTabId: FuzzyFinderTabId | ''
-    }
-
-    const fuzzyFinderState = writable<FuzzyFinderState>({ open: false, selectedTabId: '' })
-
-    export function openFuzzyFinder(tab?: FuzzyFinderTabId): void {
-        fuzzyFinderState.update(state => ({ selectedTabId: tab ?? state.selectedTabId, open: true }))
-    }
-</script>
-
 <script lang="ts">
     import { escapeRegExp } from 'lodash'
 
@@ -24,6 +8,7 @@
     import FuzzyFinder from './FuzzyFinder.svelte'
     import { filesHotkey, reposHotkey, symbolsHotkey } from './keys'
 
+    let open = false
     let finder: FuzzyFinder | undefined
     let scope = ''
 
@@ -32,10 +17,8 @@
         ignoreInputFields: false,
         handler: event => {
             event.stopPropagation()
-            fuzzyFinderState.set({
-                open: true,
-                selectedTabId: 'repos',
-            })
+            open = true
+            finder?.selectTab('repos')
             return false
         },
     })
@@ -44,10 +27,8 @@
         ignoreInputFields: false,
         handler: event => {
             event.stopPropagation()
-            fuzzyFinderState.set({
-                open: true,
-                selectedTabId: 'symbols',
-            })
+            open = true
+            finder?.selectTab('symbols')
             return false
         },
     })
@@ -57,18 +38,12 @@
         ignoreInputFields: false,
         handler: event => {
             event.stopPropagation()
-            fuzzyFinderState.set({
-                open: true,
-                selectedTabId: 'files',
-            })
+            open = true
+            finder?.selectTab('files')
             return false
         },
     })
 
-    $: if ($fuzzyFinderState.selectedTabId !== '') {
-        finder?.selectTab($fuzzyFinderState.selectedTabId)
-    }
-
     $: if ($page.params.repo) {
         const { repoName, revision } = parseRepoRevision($page.params.repo)
         scope = `repo:^${escapeRegExp(repoName)}$`
@@ -80,9 +55,4 @@
     }
 </script>
 
-<FuzzyFinder
-    bind:this={finder}
-    {scope}
-    open={$fuzzyFinderState.open}
-    on:close={() => ($fuzzyFinderState.open = false)}
-/>
+<FuzzyFinder bind:this={finder} {open} {scope} on:close={() => (open = false)} />