Loki, Prometheus: Show Query patterns in all editor modes (#50263)

This commit is contained in:
Ivana Huckova 2022-06-13 09:45:01 +02:00 committed by GitHub
parent 8fd9cb4854
commit 088a1880d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 40 deletions

View File

@ -79,8 +79,6 @@ export const LokiQueryEditorSelector = React.memo<LokiQueryEditorProps>((props)
onDismiss={() => setParseModalOpen(false)} onDismiss={() => setParseModalOpen(false)}
/> />
<EditorHeader> <EditorHeader>
{editorMode === QueryEditorMode.Builder && (
<>
<InlineSelect <InlineSelect
value={null} value={null}
placeholder="Query patterns" placeholder="Query patterns"
@ -96,8 +94,6 @@ export const LokiQueryEditorSelector = React.memo<LokiQueryEditorProps>((props)
options={lokiQueryModeller.getQueryPatterns().map((x) => ({ label: x.name, value: x }))} options={lokiQueryModeller.getQueryPatterns().map((x) => ({ label: x.name, value: x }))}
/> />
<QueryHeaderSwitch label="Raw query" value={rawQuery} onChange={onQueryPreviewChange} /> <QueryHeaderSwitch label="Raw query" value={rawQuery} onChange={onQueryPreviewChange} />
</>
)}
<FlexItem grow={1} /> <FlexItem grow={1} />
{app !== CoreApp.Explore && ( {app !== CoreApp.Explore && (
<Button <Button

View File

@ -82,8 +82,6 @@ export const PromQueryEditorSelector = React.memo<Props>((props) => {
onDismiss={() => setParseModalOpen(false)} onDismiss={() => setParseModalOpen(false)}
/> />
<EditorHeader> <EditorHeader>
{editorMode === QueryEditorMode.Builder && (
<>
<InlineSelect <InlineSelect
value={null} value={null}
placeholder="Query patterns" placeholder="Query patterns"
@ -101,8 +99,6 @@ export const PromQueryEditorSelector = React.memo<Props>((props) => {
options={promQueryModeller.getQueryPatterns().map((x) => ({ label: x.name, value: x }))} options={promQueryModeller.getQueryPatterns().map((x) => ({ label: x.name, value: x }))}
/> />
<QueryHeaderSwitch label="Raw query" value={rawQuery} onChange={onQueryPreviewChange} /> <QueryHeaderSwitch label="Raw query" value={rawQuery} onChange={onQueryPreviewChange} />
</>
)}
{editorMode === QueryEditorMode.Builder && ( {editorMode === QueryEditorMode.Builder && (
<FeedbackLink feedbackUrl="https://github.com/grafana/grafana/discussions/47693" /> <FeedbackLink feedbackUrl="https://github.com/grafana/grafana/discussions/47693" />
)} )}