Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the dependencies group across 1 directory with 4 updates #1008

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"devDependencies": {
"@babel/core": "^7.21.4",
"@grafana/eslint-config": "^6.0.0",
"@grafana/plugin-e2e": "^1.6.1",
"@grafana/plugin-e2e": "^1.8.3",
"@grafana/tsconfig": "^1.2.0-rc1",
"@playwright/test": "^1.47.2",
"@swc/core": "1.3.75",
Expand Down Expand Up @@ -68,9 +68,9 @@
},
"dependencies": {
"@emotion/css": "^11.1.3",
"@grafana/data": "9.4.3",
"@grafana/runtime": "9.4.3",
"@grafana/ui": "10.1.0",
"@grafana/data": "11.2.2",
"@grafana/runtime": "11.2.2",
"@grafana/ui": "11.2.2",
"js-sql-parser": "^1.6.0",
"pgsql-ast-parser": "^12.0.1",
"react": "^18.2.0",
Expand Down
13 changes: 6 additions & 7 deletions src/data/CHDatasource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import {
ScopedVars,
SupplementaryQueryType,
TypedVariableModel,
vectorator,
} from '@grafana/data';
import { DataSourceWithBackend, getTemplateSrv } from '@grafana/runtime';
import { Observable, map } from 'rxjs';
Expand Down Expand Up @@ -196,7 +195,7 @@ export class Datasource
};
}

getSupplementaryQuery(type: SupplementaryQueryType, query: CHQuery): CHQuery | undefined {
getSupplementaryQuery(): CHQuery | undefined {
return undefined;
}

Expand All @@ -218,11 +217,11 @@ export class Datasource
return [];
}
if (frame?.fields?.length === 1) {
return vectorator(frame?.fields[0]?.values).map((text) => ({ text, value: text }));
return frame?.fields[0]?.values.map((text) => ({ text, value: text }));
}
// convention - assume the first field is an id field
const ids = frame?.fields[0]?.values;
return vectorator(frame?.fields[1]?.values).map((text, i) => ({ text, value: ids.get(i) }));
return frame?.fields[1]?.values.map((text, i) => ({ text, value: ids.get(i) }));
}

applyTemplateVariables(query: CHQuery, scoped: ScopedVars): CHQuery {
Expand Down Expand Up @@ -644,7 +643,7 @@ export class Datasource
if (frame.fields?.length === 0) {
return [];
}
return vectorator(frame?.fields[0]?.values).map((text) => text);
return frame?.fields[0]?.values.map((text) => text);
}

async getTagKeys(): Promise<MetricFindValue[]> {
Expand Down Expand Up @@ -684,7 +683,7 @@ export class Datasource
}
const field = frame.fields[0];
// Convert to string to avoid https://github.com/grafana/grafana/issues/12209
return vectorator(field.values)
return field.values
.filter((value) => value !== null)
.map((value) => {
return { text: String(value) };
Expand All @@ -696,7 +695,7 @@ export class Datasource
const field = frame.fields.find((f) => f.name === key);
if (field) {
// Convert to string to avoid https://github.com/grafana/grafana/issues/12209
return vectorator(field.values)
return field.values
.filter((value) => value !== null)
.map((value) => {
return { text: String(value) };
Expand Down
12 changes: 6 additions & 6 deletions src/data/logs.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { aggregateRawLogsVolume, getIntervalInfo, getTimeFieldRoundingClause, LOG_LEVEL_TO_IN_CLAUSE } from './logs';
import { ArrayVector, FieldType } from '@grafana/data';
import { FieldType } from '@grafana/data';

describe('logs', () => {
describe('aggregateRawLogsVolume', () => {
Expand Down Expand Up @@ -29,7 +29,7 @@ describe('logs', () => {
frame: 'time.Time',
},
config: {},
values: new ArrayVector([1680140003000, 1680140004000, 1680140027000, 1680140053000]),
values: [1680140003000, 1680140004000, 1680140027000, 1680140053000],
entities: {},
},
{
Expand All @@ -39,7 +39,7 @@ describe('logs', () => {
frame: 'uint64',
},
config: {},
values: new ArrayVector([0, 3, 4, 10]),
values: [0, 3, 4, 10],
entities: {},
},
],
Expand Down Expand Up @@ -72,7 +72,7 @@ describe('logs', () => {
frame: 'time.Time',
},
config: {},
values: new ArrayVector([1680140003000, 1680140004000, 1680140027000, 1680140053000]),
values: [1680140003000, 1680140004000, 1680140027000, 1680140053000],
entities: {},
},
{
Expand All @@ -82,7 +82,7 @@ describe('logs', () => {
frame: 'uint64',
},
config: {},
values: new ArrayVector([1, 0, 0, 0]),
values: [1, 0, 0, 0],
entities: {},
},
{
Expand All @@ -92,7 +92,7 @@ describe('logs', () => {
frame: 'uint64',
},
config: {},
values: new ArrayVector([0, 3, 4, 10]),
values: [0, 3, 4, 10],
entities: {},
},
],
Expand Down
2 changes: 1 addition & 1 deletion src/views/CHConfigEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ export const ConfigEditor: React.FC<ConfigEditorProps> = (props) => {
<Divider />
<AliasTableConfig aliasTables={jsonData.aliasTables} onAliasTablesChange={onAliasTableConfigChange} />
<Divider />
{config.featureToggles['secureSocksDSProxyEnabled'] && versionGte(config.buildInfo.version, '10.0.0') && (
{config.secureSocksDSProxyEnabled && versionGte(config.buildInfo.version, '10.0.0') && (
<Field
label={labels.secureSocksProxy.label}
description={labels.secureSocksProxy.tooltip}
Expand Down
Loading
Loading