chrome.setMegaMenu(false)} />
- {!featureToggles.topNavCommandPalette && }
);
}
diff --git a/public/app/core/components/AppChrome/TopSearchBar.tsx b/public/app/core/components/AppChrome/TopSearchBar.tsx
index 8c21831f2ba..068199fae71 100644
--- a/public/app/core/components/AppChrome/TopSearchBar.tsx
+++ b/public/app/core/components/AppChrome/TopSearchBar.tsx
@@ -3,7 +3,6 @@ import React from 'react';
import { GrafanaTheme2 } from '@grafana/data';
import { Dropdown, ToolbarButton, useStyles2 } from '@grafana/ui';
-import { config } from 'app/core/config';
import { contextSrv } from 'app/core/core';
import { useSelector } from 'app/types';
@@ -16,7 +15,6 @@ import { SignInLink } from './TopBar/SignInLink';
import { TopNavBarMenu } from './TopBar/TopNavBarMenu';
import { TopSearchBarSection } from './TopBar/TopSearchBarSection';
import { TopSearchBarCommandPaletteTrigger } from './TopSearchBarCommandPaletteTrigger';
-import { TopSearchBarInput } from './TopSearchBarInput';
import { TOP_BAR_LEVEL_HEIGHT } from './types';
export function TopSearchBar() {
@@ -26,12 +24,6 @@ export function TopSearchBar() {
const helpNode = navIndex['help'];
const profileNode = navIndex['profile'];
- const search = config.featureToggles.topNavCommandPalette ? (
-
- ) : (
-
- );
-
return (
@@ -41,7 +33,9 @@ export function TopSearchBar() {
- {search}
+
+
+
diff --git a/public/app/core/components/AppChrome/TopSearchBarInput.tsx b/public/app/core/components/AppChrome/TopSearchBarInput.tsx
deleted file mode 100644
index 059a736dc90..00000000000
--- a/public/app/core/components/AppChrome/TopSearchBarInput.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import React, { useState } from 'react';
-
-import { locationService } from '@grafana/runtime';
-import { FilterInput, ToolbarButton, useTheme2 } from '@grafana/ui';
-import { useMediaQueryChange } from 'app/core/hooks/useMediaQueryChange';
-import { t } from 'app/core/internationalization';
-import { getSearchStateManager } from 'app/features/search/state/SearchStateManager';
-
-export function TopSearchBarInput() {
- const theme = useTheme2();
- const stateManager = getSearchStateManager();
- const state = stateManager.useState();
- const breakpoint = theme.breakpoints.values.sm;
-
- const [isSmallScreen, setIsSmallScreen] = useState(window.matchMedia(`(max-width: ${breakpoint}px)`).matches);
-
- useMediaQueryChange({
- breakpoint,
- onChange: (e) => {
- setIsSmallScreen(e.matches);
- },
- });
-
- const onOpenSearch = () => {
- locationService.partial({ search: 'open' });
- };
-
- const onSearchChange = (value: string) => {
- stateManager.onQueryChange(value);
- if (value) {
- onOpenSearch();
- }
- };
-
- if (isSmallScreen) {
- return ;
- }
-
- return (
-
- );
-}
diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts
index 4ed2a9e5fcb..b88e4126c0f 100644
--- a/public/app/core/services/keybindingSrv.ts
+++ b/public/app/core/services/keybindingSrv.ts
@@ -41,7 +41,7 @@ export class KeybindingSrv {
this.bind('g a', this.openAlerting);
this.bind('g p', this.goToProfile);
this.bind('g e', this.goToExplore);
- if (!config.featureToggles.topNavCommandPalette) {
+ if (!config.featureToggles.topnav) {
this.bind('s o', this.openSearch);
this.bind('f', this.openSearch);
}
diff --git a/public/app/features/commandPalette/CommandPalette.tsx b/public/app/features/commandPalette/CommandPalette.tsx
index 82036481739..8c1b91f8a42 100644
--- a/public/app/features/commandPalette/CommandPalette.tsx
+++ b/public/app/features/commandPalette/CommandPalette.tsx
@@ -15,7 +15,7 @@ import {
import React, { useEffect, useMemo, useRef } from 'react';
import { GrafanaTheme2 } from '@grafana/data';
-import { config, reportInteraction } from '@grafana/runtime';
+import { reportInteraction } from '@grafana/runtime';
import { Icon, Spinner, useStyles2 } from '@grafana/ui';
import { t } from 'app/core/internationalization';
@@ -135,13 +135,11 @@ const RenderResults = ({ searchResults }: RenderResultsProps) => {
};
const getSearchStyles = (theme: GrafanaTheme2) => {
- const topNavCommandPalette = Boolean(config.featureToggles.topNavCommandPalette);
-
return {
positioner: css({
zIndex: theme.zIndex.portal,
marginTop: '0px',
- paddingTop: topNavCommandPalette ? '4px !important' : undefined,
+ paddingTop: '4px !important',
'&::before': {
content: '""',
position: 'fixed',
diff --git a/public/app/features/commandPalette/actions/staticActions.ts b/public/app/features/commandPalette/actions/staticActions.ts
index a973e239111..7ab513ae6c6 100644
--- a/public/app/features/commandPalette/actions/staticActions.ts
+++ b/public/app/features/commandPalette/actions/staticActions.ts
@@ -1,5 +1,4 @@
import { locationUtil, NavModelItem } from '@grafana/data';
-import { config, locationService } from '@grafana/runtime';
import { t } from 'app/core/internationalization';
import { changeTheme } from 'app/core/services/theme';
@@ -75,17 +74,6 @@ export default (navBarTree: NavModelItem[]): CommandPaletteAction[] => {
},
];
- if (!config.featureToggles.topNavCommandPalette) {
- globalActions.unshift({
- id: 'go/search',
- name: t('command-palette.action.search', 'Search'),
- keywords: 'navigate',
- perform: () => locationService.push('?search=open'),
- section: t('command-palette.section.pages', 'Pages'),
- priority: DEFAULT_PRIORITY,
- });
- }
-
const navBarActions = navTreeToActions(navBarTree);
return [...globalActions, ...navBarActions];