root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 152 Packages Projects Releases Wiki Activity

minor lint fixes

This commit is contained in:
Ryan McKinley 2024-07-01 08:12:28 -07:00
parent 9f2aae1c48
commit fe8a05c648
6 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/registry/apis/dashboard/legacy/sql_dashboards.go
View File

@ -115,7 +115,7 @@ func (a *dashboardSqlAccess) getRows(ctx context.Context, query *DashboardQuery)
// } // }
} }
sqlcmd := selector var sqlcmd string
args := []any{query.OrgID} args := []any{query.OrgID}
limit := query.Limit limit := query.Limit

2
pkg/services/apiserver/options/storage.go
View File

@ -49,7 +49,7 @@ func (o *StorageOptions) Validate() []error {
case StorageTypeFile, StorageTypeEtcd, StorageTypeLegacy, StorageTypeUnified, StorageTypeUnifiedGrpc, StorageTypeUnifiedNext, StorageTypeUnifiedNextGrpc: case StorageTypeFile, StorageTypeEtcd, StorageTypeLegacy, StorageTypeUnified, StorageTypeUnifiedGrpc, StorageTypeUnifiedNext, StorageTypeUnifiedNextGrpc:
// no-op // no-op
default: default:
errs = append(errs, fmt.Errorf("--grafana-apiserver-storage-type must be one of %s, %s, %s, %s, %s, %s", StorageTypeFile, StorageTypeEtcd, StorageTypeLegacy, StorageTypeUnified, StorageTypeUnifiedGrpc, StorageTypeUnifiedNext, StorageTypeUnifiedNextGrpc)) errs = append(errs, fmt.Errorf("--grafana-apiserver-storage-type must be one of %s, %s, %s, %s, %s, %s, %s", StorageTypeFile, StorageTypeEtcd, StorageTypeLegacy, StorageTypeUnified, StorageTypeUnifiedGrpc, StorageTypeUnifiedNext, StorageTypeUnifiedNextGrpc))
} }
if _, _, err := net.SplitHostPort(o.Address); err != nil { if _, _, err := net.SplitHostPort(o.Address); err != nil {

104
pkg/tests/apis/dashboard/dashboards_test.go
View File

@ -1,6 +1,7 @@
package dashboards package dashboards
import ( import (
"fmt"
"testing" "testing"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@ -47,58 +48,59 @@ func TestIntegrationDashboardsApp(t *testing.T) {
t.Run("Check discovery client", func(t *testing.T) { t.Run("Check discovery client", func(t *testing.T) {
disco := helper.GetGroupVersionInfoJSON("dashboard.grafana.app") disco := helper.GetGroupVersionInfoJSON("dashboard.grafana.app")
//fmt.Printf("%s", string(disco)) fmt.Printf("%s", string(disco))
require.JSONEq(t, `[ require.JSONEq(t, `[
{ {
"freshness": "Current", "freshness": "Current",
"resources": [ "resources": [
{ {
"resource": "dashboards", "resource": "dashboards",
"responseKind": { "responseKind": {
"group": "", "group": "",
"kind": "Dashboard", "kind": "Dashboard",
"version": "" "version": ""
}, },
"scope": "Namespaced", "scope": "Namespaced",
"singularResource": "dashboard", "singularResource": "dashboard",
"subresources": [ "subresources": [
{ {
"responseKind": { "responseKind": {
"group": "", "group": "",
"kind": "DashboardWithAccessInfo", "kind": "DashboardWithAccessInfo",
"version": "" "version": ""
}, },
"subresource": "dto", "subresource": "dto",
"verbs": [ "verbs": [
"get" "get"
] ]
}, },
{ {
"responseKind": { "responseKind": {
"group": "", "group": "",
"kind": "DashboardVersionList", "kind": "PartialObjectMetadataList",
"version": "" "version": ""
}, },
"subresource": "versions", "subresource": "history",
"verbs": [ "verbs": [
"get" "get"
] ]
} }
], ],
"verbs": [ "verbs": [
"create", "create",
"delete", "delete",
"deletecollection", "deletecollection",
"get", "get",
"list", "list",
"patch", "patch",
"update" "update",
] "watch"
} ]
], }
"version": "v0alpha1" ],
} "version": "v0alpha1"
]`, disco) }
]`, disco)
}) })
} }

2
public/app/features/dashboard-scene/settings/VersionsEditView.tsx
View File

@ -158,7 +158,7 @@ export class VersionsEditView extends SceneObjectBase<VersionsEditViewState> imp
}); });
}; };
public onCheck = (ev: React.FormEvent<HTMLInputElement>, versionId: number|string) => { public onCheck = (ev: React.FormEvent<HTMLInputElement>, versionId: number | string) => {
this.setState({ this.setState({
versions: this.versions.map((version) => versions: this.versions.map((version) =>
version.version === versionId ? { ...version, checked: ev.currentTarget.checked } : version version.version === versionId ? { ...version, checked: ev.currentTarget.checked } : version

13
public/app/features/dashboard-scene/settings/version-history/HistorySrv.ts
View File

@ -7,7 +7,7 @@ export interface HistoryListOpts {
start: number; start: number;
} }
// The raw version from // The raw version from
export interface VersionModel { export interface VersionModel {
uid: string; uid: string;
version: number | string; // resourceVersion in k8s version: number | string; // resourceVersion in k8s
@ -33,7 +33,7 @@ class LegacyHistorySrv implements HistorySrv {
async getDashboardVersion(dashboardUID: string, version: number): Promise<Dashboard | {}> { async getDashboardVersion(dashboardUID: string, version: number): Promise<Dashboard | {}> {
if (typeof dashboardUID !== 'string') { if (typeof dashboardUID !== 'string') {
return Promise.resolve({}) return Promise.resolve({});
} }
const info = await getBackendSrv().get(`api/dashboards/uid/${dashboardUID}/versions/${version}`); const info = await getBackendSrv().get(`api/dashboards/uid/${dashboardUID}/versions/${version}`);
@ -42,7 +42,7 @@ class LegacyHistorySrv implements HistorySrv {
restoreDashboard(dashboardUID: string, version: number): Promise<SaveDashboardResponseDTO | {}> { restoreDashboard(dashboardUID: string, version: number): Promise<SaveDashboardResponseDTO | {}> {
if (typeof dashboardUID !== 'string') { if (typeof dashboardUID !== 'string') {
return Promise.resolve({}) return Promise.resolve({});
} }
const url = `api/dashboards/uid/${dashboardUID}/restore`; const url = `api/dashboards/uid/${dashboardUID}/restore`;
@ -51,12 +51,11 @@ class LegacyHistorySrv implements HistorySrv {
} }
} }
let historySrv: HistorySrv | undefined = undefined;
let historySrv: HistorySrv|undefined = undefined;
export function getHistorySrv(): HistorySrv { export function getHistorySrv(): HistorySrv {
if (!historySrv) { if (!historySrv) {
historySrv = new LegacyHistorySrv() historySrv = new LegacyHistorySrv();
} }
return historySrv return historySrv;
} }

8
public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx
View File

@ -135,8 +135,8 @@ describe('VersionSettings', () => {
}); });
test('clicking show more appends results to the table', async () => { test('clicking show more appends results to the table', async () => {
getHistorySrv().getHistoryList getHistorySrv()
// @ts-ignore .getHistoryList// @ts-ignore
.mockImplementationOnce(() => Promise.resolve(versions.slice(0, VERSIONS_FETCH_LIMIT))) .mockImplementationOnce(() => Promise.resolve(versions.slice(0, VERSIONS_FETCH_LIMIT)))
.mockImplementationOnce( .mockImplementationOnce(
() => new Promise((resolve) => setTimeout(() => resolve(versions.slice(VERSIONS_FETCH_LIMIT)), 1000)) () => new Promise((resolve) => setTimeout(() => resolve(versions.slice(VERSIONS_FETCH_LIMIT)), 1000))
@ -166,8 +166,8 @@ describe('VersionSettings', () => {
test('selecting two versions and clicking compare button should render compare view', async () => { test('selecting two versions and clicking compare button should render compare view', async () => {
// @ts-ignore // @ts-ignore
historySrv.getHistoryList.mockResolvedValue(versions.slice(0, VERSIONS_FETCH_LIMIT)); historySrv.getHistoryList.mockResolvedValue(versions.slice(0, VERSIONS_FETCH_LIMIT));
getHistorySrv().getDashboardVersion getHistorySrv()
// @ts-ignore .getDashboardVersion// @ts-ignore
.mockImplementationOnce(() => Promise.resolve(diffs.lhs)) .mockImplementationOnce(() => Promise.resolve(diffs.lhs))
.mockImplementationOnce(() => Promise.resolve(diffs.rhs)); .mockImplementationOnce(() => Promise.resolve(diffs.rhs));