{
- {this.props.useExperimentalEditor ? (
-
- ) : (
-
- )}
+
diff --git a/pkg/ui/react-app/src/pages/graph/PanelList.test.tsx b/pkg/ui/react-app/src/pages/graph/PanelList.test.tsx
index 7cc00b6a7f..1056e33468 100755
--- a/pkg/ui/react-app/src/pages/graph/PanelList.test.tsx
+++ b/pkg/ui/react-app/src/pages/graph/PanelList.test.tsx
@@ -12,7 +12,6 @@ describe('PanelList', () => {
{ id: 'query-history-checkbox', label: 'Enable query history', default: false },
{ id: 'debug-mode-checkbox', label: 'Enable Store Filtering', default: false },
{ id: 'autocomplete-checkbox', label: 'Enable autocomplete', default: true },
- { id: 'use-experimental-editor-checkbox', label: 'Use experimental editor', default: true },
{ id: 'highlighting-checkbox', label: 'Enable highlighting', default: true },
{ id: 'linter-checkbox', label: 'Enable linter', default: true },
].forEach((cb, idx) => {
diff --git a/pkg/ui/react-app/src/pages/graph/PanelList.tsx b/pkg/ui/react-app/src/pages/graph/PanelList.tsx
index b40169d942..6cd88a1bae 100644
--- a/pkg/ui/react-app/src/pages/graph/PanelList.tsx
+++ b/pkg/ui/react-app/src/pages/graph/PanelList.tsx
@@ -23,7 +23,6 @@ export const updateURL = (nextPanels: PanelMeta[]) => {
interface PanelListProps extends PathPrefixProps, RouteComponentProps {
panels: PanelMeta[];
metrics: string[];
- useExperimentalEditor: boolean;
useLocalTime: boolean;
queryHistoryEnabled: boolean;
stores: StoreListProps;
@@ -35,7 +34,6 @@ interface PanelListProps extends PathPrefixProps, RouteComponentProps {
export const PanelListContent: FC = ({
metrics = [],
- useExperimentalEditor,
useLocalTime,
pathPrefix,
queryHistoryEnabled,
@@ -120,7 +118,6 @@ export const PanelListContent: FC = ({
)
)
}
- useExperimentalEditor={useExperimentalEditor}
useLocalTime={useLocalTime}
metricNames={metrics}
pastQueries={queryHistoryEnabled ? historyItems : []}
@@ -143,7 +140,6 @@ const PanelListContentWithIndicator = withStatusIndicator(PanelListContent);
const PanelList: FC = ({ pathPrefix = '' }) => {
const [delta, setDelta] = useState(0);
- const [useExperimentalEditor, setUseExperimentalEditor] = useLocalStorage('use-new-editor', true);
const [useLocalTime, setUseLocalTime] = useLocalStorage('use-local-time', false);
const [enableQueryHistory, setEnableQueryHistory] = useLocalStorage('enable-query-history', false);
const [debugMode, setDebugMode] = useState(false);
@@ -208,6 +204,8 @@ const PanelList: FC = ({ pathPrefix = ''
>
Enable Store Filtering
+
+
= ({ pathPrefix = ''
>
Enable autocomplete
-
-
- setUseExperimentalEditor(target.checked)}
- defaultChecked={useExperimentalEditor}
- >
- Use experimental editor
-
setEnableHighlighting(target.checked)}
defaultChecked={enableHighlighting}
- disabled={!useExperimentalEditor}
>
Enable highlighting
@@ -240,7 +227,6 @@ const PanelList: FC = ({ pathPrefix = ''
id="linter-checkbox"
onChange={({ target }) => setEnableLinter(target.checked)}
defaultChecked={enableLinter}
- disabled={!useExperimentalEditor}
>
Enable linter
@@ -275,7 +261,6 @@ const PanelList: FC = ({ pathPrefix = ''