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

Chore: Remove FolderID from DTO Folder (#78420)

Browse Source 
* Chore: Remove FolderID from DTO Folder

* chore: add OrgID field to an instance of SaveDashboardCommand

* chore: add another OrgID to pair with the FolderUID:

* chore: add OrgId to Folder struct and expectedParentOrgIDs to testCase struct, unsure if last part is necessary

* Fix folder test, add expected orgID

* chore: regen specs

---------

Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com>
This commit is contained in:
Kat Yang
2023-12-07 07:56:04 -05:00
committed by GitHub
parent cdff30ac44
commit 31fb38723d
5 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/tests/api/dashboards/api_dashboards_test.go
View File

@@ -328,6 +328,7 @@ func TestIntegrationCreate(t *testing.T) {
buf1 := &bytes.Buffer{}
err = json.NewEncoder(buf1).Encode(dashboards.SaveDashboardCommand{
Dashboard: dashboardDataOne,
OrgID: 0,
FolderUID: folder.UID,
})
require.NoError(t, err)
@@ -358,7 +359,8 @@ func TestIntegrationCreate(t *testing.T) {
buf1 := &bytes.Buffer{}
err = json.NewEncoder(buf1).Encode(dashboards.SaveDashboardCommand{
Dashboard: dashboardDataOne,
FolderID: folder.ID, // nolint:staticcheck
OrgID: 0,
FolderUID: folder.UID,
})
require.NoError(t, err)
u := fmt.Sprintf("http://admin:admin@%s/api/dashboards/db", grafanaListedAddr)