IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Prometheus: Set default mode to Code (#47342)

Browse Source 
* Set default to Code

* Fix tests
This commit is contained in:
Andrej Ocenas 2022-04-06 10:07:11 +02:00 committed by GitHub
parent bd386df617
commit ad4fcfd69b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.test.tsx
View File

@ -51,7 +51,7 @@ describe('PromQueryEditorSelector', () => {
expectCodeEditor(); expectCodeEditor();
}); });
it('shows builder if new query', async () => { it('shows code if new query', async () => {
render( render(
<PromQueryEditorSelector <PromQueryEditorSelector
{...defaultProps} {...defaultProps}
@ -61,7 +61,7 @@ describe('PromQueryEditorSelector', () => {
}} }}
/> />
); );
expectBuilder(); expectCodeEditor();
}); });
it('shows code editor when code mode is set', async () => { it('shows code editor when code mode is set', async () => {

4
public/app/plugins/datasource/prometheus/querybuilder/state.test.ts
View File

@ -5,7 +5,7 @@ import { changeEditorMode, getQueryWithDefaults } from './state';
describe('getQueryWithDefaults(', () => { describe('getQueryWithDefaults(', () => {
it('should set defaults', () => { it('should set defaults', () => {
expect(getQueryWithDefaults({ refId: 'A' } as any, CoreApp.Dashboard)).toEqual({ expect(getQueryWithDefaults({ refId: 'A' } as any, CoreApp.Dashboard)).toEqual({
editorMode: 'builder', editorMode: 'code',
expr: '', expr: '',
legendFormat: '__auto', legendFormat: '__auto',
range: true, range: true,
@ -15,7 +15,7 @@ describe('getQueryWithDefaults(', () => {
it('should set both range and instant to true when in Explore', () => { it('should set both range and instant to true when in Explore', () => {
expect(getQueryWithDefaults({ refId: 'A' } as any, CoreApp.Explore)).toEqual({ expect(getQueryWithDefaults({ refId: 'A' } as any, CoreApp.Explore)).toEqual({
editorMode: 'builder', editorMode: 'code',
expr: '', expr: '',
legendFormat: '__auto', legendFormat: '__auto',
range: true, range: true,

7
public/app/plugins/datasource/prometheus/querybuilder/state.ts
View File

@ -14,7 +14,8 @@ export function changeEditorMode(query: PromQuery, editorMode: QueryEditorMode,
onChange({ ...query, editorMode }); onChange({ ...query, editorMode });
} }
export function getDefaultEditorMode(expr: string) { // @ts-ignore Will be used after builder is out of beta
function getDefaultEditorMode(expr: string) {
// If we already have an expression default to code view // If we already have an expression default to code view
if (expr != null && expr !== '') { if (expr != null && expr !== '') {
return QueryEditorMode.Code; return QueryEditorMode.Code;
@ -35,11 +36,11 @@ export function getDefaultEditorMode(expr: string) {
* Returns query with defaults, and boolean true/false depending on change was required * Returns query with defaults, and boolean true/false depending on change was required
*/ */
export function getQueryWithDefaults(query: PromQuery, app: CoreApp | undefined): PromQuery { export function getQueryWithDefaults(query: PromQuery, app: CoreApp | undefined): PromQuery {
// If no expr (ie new query) then default to builder
let result = query; let result = query;
if (!query.editorMode) { if (!query.editorMode) {
result = { ...query, editorMode: getDefaultEditorMode(query.expr) }; // Default to Code mode until we are out of beta with the builder, then use getDefaultEditorMode.
result = { ...query, editorMode: QueryEditorMode.Code };
} }
if (query.expr == null) { if (query.expr == null) {