Loki, Prometheus: Remove beta tag from query builder (#55150)

pull/55097/head
Ivana Huckova 3 years ago committed by GitHub
parent 95512c19e0
commit 82a6872f0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      public/app/plugins/datasource/loki/querybuilder/components/LokiQueryEditorSelector.tsx
  2. 2
      public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.tsx
  3. 19
      public/app/plugins/datasource/prometheus/querybuilder/shared/QueryEditorModeToggle.tsx

@ -4,7 +4,6 @@ import { CoreApp, LoadingState, SelectableValue } from '@grafana/data';
import { selectors } from '@grafana/e2e-selectors'; import { selectors } from '@grafana/e2e-selectors';
import { reportInteraction } from '@grafana/runtime'; import { reportInteraction } from '@grafana/runtime';
import { Button, ConfirmModal, EditorHeader, EditorRows, FlexItem, InlineSelect, Space } from '@grafana/ui'; import { Button, ConfirmModal, EditorHeader, EditorRows, FlexItem, InlineSelect, Space } from '@grafana/ui';
import { FeedbackLink } from 'app/plugins/datasource/prometheus/querybuilder/shared/FeedbackLink';
import { QueryEditorModeToggle } from 'app/plugins/datasource/prometheus/querybuilder/shared/QueryEditorModeToggle'; import { QueryEditorModeToggle } from 'app/plugins/datasource/prometheus/querybuilder/shared/QueryEditorModeToggle';
import { QueryHeaderSwitch } from 'app/plugins/datasource/prometheus/querybuilder/shared/QueryHeaderSwitch'; import { QueryHeaderSwitch } from 'app/plugins/datasource/prometheus/querybuilder/shared/QueryHeaderSwitch';
import { QueryEditorMode } from 'app/plugins/datasource/prometheus/querybuilder/shared/types'; import { QueryEditorMode } from 'app/plugins/datasource/prometheus/querybuilder/shared/types';
@ -129,7 +128,6 @@ export const LokiQueryEditorSelector = React.memo<LokiQueryEditorProps>((props)
{editorMode === QueryEditorMode.Builder && ( {editorMode === QueryEditorMode.Builder && (
<> <>
<QueryHeaderSwitch label="Raw query" value={rawQuery} onChange={onQueryPreviewChange} /> <QueryHeaderSwitch label="Raw query" value={rawQuery} onChange={onQueryPreviewChange} />
<FeedbackLink feedbackUrl="https://github.com/grafana/grafana/discussions/50785" />
</> </>
)} )}
<FlexItem grow={1} /> <FlexItem grow={1} />

@ -8,7 +8,6 @@ import { PromQueryEditorProps } from '../../components/types';
import { PromQuery } from '../../types'; import { PromQuery } from '../../types';
import { promQueryModeller } from '../PromQueryModeller'; import { promQueryModeller } from '../PromQueryModeller';
import { buildVisualQueryFromString } from '../parsing'; import { buildVisualQueryFromString } from '../parsing';
import { FeedbackLink } from '../shared/FeedbackLink';
import { QueryEditorModeToggle } from '../shared/QueryEditorModeToggle'; import { QueryEditorModeToggle } from '../shared/QueryEditorModeToggle';
import { QueryHeaderSwitch } from '../shared/QueryHeaderSwitch'; import { QueryHeaderSwitch } from '../shared/QueryHeaderSwitch';
import { promQueryEditorExplainKey, promQueryEditorRawQueryKey, useFlag } from '../shared/hooks/useFlag'; import { promQueryEditorExplainKey, promQueryEditorRawQueryKey, useFlag } from '../shared/hooks/useFlag';
@ -107,7 +106,6 @@ export const PromQueryEditorSelector = React.memo<Props>((props) => {
{editorMode === QueryEditorMode.Builder && ( {editorMode === QueryEditorMode.Builder && (
<> <>
<QueryHeaderSwitch label="Raw query" value={rawQuery} onChange={onQueryPreviewChange} /> <QueryHeaderSwitch label="Raw query" value={rawQuery} onChange={onQueryPreviewChange} />
<FeedbackLink feedbackUrl="https://github.com/grafana/grafana/discussions/47693" />
</> </>
)} )}
<FlexItem grow={1} /> <FlexItem grow={1} />

@ -1,7 +1,6 @@
import { css } from '@emotion/css';
import React from 'react'; import React from 'react';
import { RadioButtonGroup, Tag } from '@grafana/ui'; import { RadioButtonGroup } from '@grafana/ui';
import { QueryEditorMode } from './types'; import { QueryEditorMode } from './types';
@ -11,21 +10,7 @@ export interface Props {
} }
const editorModes = [ const editorModes = [
{ { label: 'Builder', value: QueryEditorMode.Builder },
label: 'Builder',
value: QueryEditorMode.Builder,
component: () => (
<Tag
className={css({
fontSize: 10,
padding: '1px 5px',
verticalAlign: 'text-bottom',
})}
name={'Beta'}
colorIndex={1}
/>
),
},
{ label: 'Code', value: QueryEditorMode.Code }, { label: 'Code', value: QueryEditorMode.Code },
]; ];

Loading…
Cancel
Save