Merge remote-tracking branch 'origin/main' into ty/add-cody-pro-links-to-user-nav

Author: taras-yemets

.aspect/bazelrc/ci.sourcegraph.bazelrc

@@ -59,7 +59,8 @@ test --build_event_binary_file_path_conversion=false
 test --build_event_binary_file_upload_mode=wait_for_upload_complete
 test --build_event_publish_all_actions=true
 
-common --experimental_execution_log_compact_file=execution_log.zstd
+build --experimental_execution_log_compact_file=execution_log.zstd
+test --experimental_execution_log_compact_file=execution_log.zstd
 
 # These likely perform faster locally than the overhead of pulling/pushing from/to the remote cache,
 # as well as being able to reduce how much we push to the cache

.bazelignore

@@ -46,6 +46,7 @@ client/storybook/storybook-static
 client/plugin-backstage/node_modules
 client/app-shell/node_modules
 client/backstage-backend/node_modules
+client/backstage-frontend/node_modules
 client/cody/node_modules
 client/cody-agent/node_modules
 client/cody-cli/node_modules

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,41 +1,9 @@
-<!-- 💡 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 -->
-
+<!-- PR description tips: https://www.notion.so/sourcegraph/Write-a-good-pull-request-description-610a7fd3e613496eb76f450db5a49b6e -->
 
 ## Test plan
 
-<!-- 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:
+<!-- REQUIRED; info at https://docs-legacy.sourcegraph.com/dev/background-information/testing_principles -->
 
 ## Changelog
 
-- When a quote is used with regexp pattern type, then ...
-- Refactored underlying code.
--->
+<!-- OPTIONAL; info at https://www.notion.so/sourcegraph/Writing-a-changelog-entry-dd997f411d524caabf0d8d38a24a878c -->

client/branded/src/search-ui/input/SearchBox.story.tsx

@@ -28,7 +28,8 @@ const defaultProps: SearchBoxProps = {
     telemetryRecorder: noOpTelemetryRecorder,
     queryState: { query: 'hello repo:test' },
     isSourcegraphDotCom: false,
-    patternType: SearchPatternType.standard,
+    patternType: SearchPatternType.keyword,
+    defaultPatternType: SearchPatternType.keyword,
     setPatternType: () => {},
     caseSensitive: false,
     setCaseSensitivity: () => {},
@@ -61,11 +62,21 @@ export const SearchBoxStory: StoryFn = () => (
                     <SearchBox {...defaultProps} patternType={SearchPatternType.regexp} />
                 </div>
 
+                <H2>Standard enabled</H2>
+                <div className="w-100 d-flex my-2">
+                    <SearchBox {...defaultProps} patternType={SearchPatternType.standard} />
+                </div>
+
                 <H2>Structural enabled</H2>
                 <div className="w-100 d-flex my-2">
                     <SearchBox {...defaultProps} patternType={SearchPatternType.structural} />
                 </div>
 
+                <H2>Default patterntype</H2>
+                <div className="w-100 d-flex my-2">
+                    <SearchBox {...defaultProps} defaultPatternType={SearchPatternType.standard} />
+                </div>
+
                 <H2>Case sensitivity enabled</H2>
                 <div className="w-100 d-flex my-2">
                     <SearchBox {...defaultProps} caseSensitive={true} />

client/branded/src/search-ui/input/SearchBox.tsx

@@ -194,6 +194,7 @@ export const SearchBox: FC<SearchBoxProps> = props => {
                     {props.showKeywordSearchToggle ? (
                         <Toggles
                             patternType={props.patternType}
+                            defaultPatternType={props.defaultPatternType}
                             setPatternType={props.setPatternType}
                             caseSensitive={props.caseSensitive}
                             setCaseSensitivity={props.setCaseSensitivity}

client/branded/src/search-ui/input/toggles/Toggles.test.tsx

@@ -15,7 +15,8 @@ describe('Toggles', () => {
             renderWithBrandedContext(
                 <Toggles
                     navbarSearchQuery="(case:yes foo) or (case:no bar)"
-                    patternType={SearchPatternType.standard}
+                    patternType={SearchPatternType.keyword}
+                    defaultPatternType={SearchPatternType.keyword}
                     setPatternType={() => undefined}
                     caseSensitive={false}
                     setCaseSensitivity={() => undefined}
@@ -33,7 +34,8 @@ describe('Toggles', () => {
             renderWithBrandedContext(
                 <Toggles
                     navbarSearchQuery="(foo patterntype:literal) or (bar patterntype:structural)"
-                    patternType={SearchPatternType.standard}
+                    patternType={SearchPatternType.keyword}
+                    defaultPatternType={SearchPatternType.keyword}
                     setPatternType={() => undefined}
                     caseSensitive={false}
                     setCaseSensitivity={() => undefined}
@@ -50,7 +52,26 @@ describe('Toggles', () => {
             renderWithBrandedContext(
                 <Toggles
                     navbarSearchQuery="(foo patterntype:literal) or (bar patterntype:structural)"
-                    patternType={SearchPatternType.standard}
+                    patternType={SearchPatternType.keyword}
+                    defaultPatternType={SearchPatternType.keyword}
+                    setPatternType={() => undefined}
+                    caseSensitive={false}
+                    setCaseSensitivity={() => undefined}
+                    searchMode={SearchMode.Precise}
+                    setSearchMode={() => undefined}
+                    telemetryService={NOOP_TELEMETRY_SERVICE}
+                    telemetryRecorder={noOpTelemetryRecorder}
+                />
+            )
+            expect(screen.getAllByRole('checkbox', { name: 'Regular expression toggle' })).toMatchSnapshot()
+        })
+
+        test('regexp toggle with default patterntype', () => {
+            renderWithBrandedContext(
+                <Toggles
+                    navbarSearchQuery="foo.*bar"
+                    patternType={SearchPatternType.keyword}
+                    defaultPatternType={SearchPatternType.standard}
                     setPatternType={() => undefined}
                     caseSensitive={false}
                     setCaseSensitivity={() => undefined}

client/branded/src/search-ui/input/toggles/Toggles.tsx

@@ -28,6 +28,7 @@ export interface TogglesProps
         TelemetryV2Props,
         Partial<Pick<SubmitSearchProps, 'submitSearch'>> {
     navbarSearchQuery: string
+    defaultPatternType: SearchPatternType
     className?: string
     /**
      * If set to false makes all buttons non-actionable. The main use case for
@@ -46,6 +47,7 @@ export const Toggles: React.FunctionComponent<React.PropsWithChildren<TogglesPro
     const {
         navbarSearchQuery,
         patternType,
+        defaultPatternType,
         setPatternType,
         caseSensitive,
         setCaseSensitivity,
@@ -75,23 +77,22 @@ export const Toggles: React.FunctionComponent<React.PropsWithChildren<TogglesPro
     }, [caseSensitive, setCaseSensitivity, submitOnToggle, telemetryRecorder])
 
     const toggleRegexp = useCallback((): void => {
-        const newPatternType =
-            patternType !== SearchPatternType.regexp ? SearchPatternType.regexp : SearchPatternType.keyword
+        const newPatternType = patternType !== SearchPatternType.regexp ? SearchPatternType.regexp : defaultPatternType
 
         setPatternType(newPatternType)
         submitOnToggle({ newPatternType })
         telemetryService.log('ToggleRegexpPatternType', { currentStatus: patternType === SearchPatternType.regexp })
         telemetryRecorder.recordEvent('search.regexpPatternType', 'toggle')
-    }, [patternType, setPatternType, submitOnToggle, telemetryService, telemetryRecorder])
+    }, [patternType, defaultPatternType, setPatternType, submitOnToggle, telemetryService, telemetryRecorder])
 
     const toggleStructuralSearch = useCallback((): void => {
         const newPatternType: SearchPatternType =
-            patternType !== SearchPatternType.structural ? SearchPatternType.structural : SearchPatternType.keyword
+            patternType !== SearchPatternType.structural ? SearchPatternType.structural : defaultPatternType
 
         setPatternType(newPatternType)
         submitOnToggle({ newPatternType })
         telemetryRecorder.recordEvent('search.structuralPatternType', 'toggle')
-    }, [patternType, setPatternType, submitOnToggle, telemetryRecorder])
+    }, [patternType, defaultPatternType, setPatternType, submitOnToggle, telemetryRecorder])
 
     return (
         <div className={classNames(className, styles.toggleContainer)}>

client/branded/src/search-ui/input/toggles/__snapshots__/Toggles.test.tsx.snap

@@ -69,6 +69,7 @@ export interface SearchQueryState {
     queryState: QueryState
     searchCaseSensitivity: boolean
     searchPatternType: SearchPatternType
+    defaultPatternType: SearchPatternType
     searchQueryFromURL: string
     searchMode: SearchMode
 

client/shared/src/search/searchQueryState.tsx

@@ -167,6 +167,7 @@ export const SearchHomeView: React.FunctionComponent<React.PropsWithChildren<Sea
                         caseSensitive={caseSensitive}
                         setCaseSensitivity={setCaseSensitivity}
                         patternType={patternType}
+                        defaultPatternType={SearchPatternType.standard}
                         setPatternType={setPatternType}
                         searchMode={searchMode}
                         setSearchMode={setSearchMode}