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

PublicDashboards: Remove publicDashboardUid from DashboardMeta (#85126)

Browse Source
This commit is contained in:
Juan Cabanas 2024-05-23 11:21:21 -03:00 committed by GitHub
parent 6e88802cab
commit a85c1b69d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/grafana-runtime/src/analytics/types.ts
View File

@ -14,7 +14,6 @@ export interface DashboardInfo {
dashboardUid: string;
dashboardName: string;
folderName?: string;
publicDashboardUid?: string;
}
/**

1
pkg/api/dtos/dashboard.go
View File

@ -34,7 +34,6 @@ type DashboardMeta struct {
Provisioned bool `json:"provisioned"`
ProvisionedExternalId string `json:"provisionedExternalId"`
AnnotationsPermissions *dashboardsV0.AnnotationPermission `json:"annotationsPermissions"`
PublicDashboardUID string `json:"publicDashboardUid,omitempty"`
PublicDashboardEnabled bool `json:"publicDashboardEnabled,omitempty"`
}

3
pkg/services/publicdashboards/api/query_test.go
View File

@ -120,9 +120,6 @@ func TestAPIViewPublicDashboard(t *testing.T) {
assert.Equal(t, false, dashResp.Meta.CanEdit)
assert.Equal(t, false, dashResp.Meta.CanDelete)
assert.Equal(t, false, dashResp.Meta.CanSave)
// publicDashboardUID should be always empty
assert.Equal(t, "", dashResp.Meta.PublicDashboardUID)
} else if test.FixedErrorResponse != "" {
require.Equal(t, test.ExpectedHttpResponse, response.Code)
require.JSONEq(t, "{\"message\":\"Invalid access token\", \"messageId\":\"publicdashboards.invalidAccessToken\", \"statusCode\":400, \"traceID\":\"\"}", response.Body.String())

3
public/api-enterprise-spec.json
View File

@ -3753,9 +3753,6 @@
"publicDashboardEnabled": {
"type": "boolean"
},
"publicDashboardUid": {
"type": "string"
},
"slug": {
"type": "string"
},

3
public/api-merged.json
View File

@ -13901,9 +13901,6 @@
"publicDashboardEnabled": {
"type": "boolean"
},
"publicDashboardUid": {
"type": "string"
},
"slug": {
"type": "string"
},

11
public/app/features/dashboard/api/publicDashboardApi.ts
View File

@ -86,12 +86,11 @@ export const publicDashboardApi = createApi({
if (dashboard instanceof DashboardScene) {
dashboard.setState({
meta: { ...dashboard.state.meta, publicDashboardEnabled: data.isEnabled, publicDashboardUid: data.uid },
meta: { ...dashboard.state.meta, publicDashboardEnabled: data.isEnabled },
});
} else {
// Update runtime meta flag
dashboard.updateMeta({
publicDashboardUid: data.uid,
publicDashboardEnabled: data.isEnabled,
});
}
@ -121,11 +120,10 @@ export const publicDashboardApi = createApi({
if (dashboard instanceof DashboardScene) {
dashboard.setState({
meta: { ...dashboard.state.meta, publicDashboardEnabled: data.isEnabled, publicDashboardUid: data.uid },
meta: { ...dashboard.state.meta, publicDashboardEnabled: data.isEnabled },
});
} else {
dashboard.updateMeta?.({
publicDashboardUid: data.uid,
publicDashboardEnabled: data.isEnabled,
});
}
@ -183,17 +181,16 @@ export const publicDashboardApi = createApi({
url: `/dashboards/uid/${params.dashboardUid}/public-dashboards/${params.uid}`,
method: 'DELETE',
}),
async onQueryStarted({ dashboard, uid }, { dispatch, queryFulfilled }) {
async onQueryStarted({ dashboard }, { dispatch, queryFulfilled }) {
await queryFulfilled;
dispatch(notifyApp(createSuccessNotification('Public dashboard deleted!')));
if (dashboard instanceof DashboardScene) {
dashboard.setState({
meta: { ...dashboard.state.meta, publicDashboardUid: uid, publicDashboardEnabled: false },
meta: { ...dashboard.state.meta, publicDashboardEnabled: false },
});
} else {
dashboard?.updateMeta({
publicDashboardUid: uid,
publicDashboardEnabled: false,
});
}

1
public/app/types/dashboard.ts
View File

@ -63,7 +63,6 @@ export interface DashboardMeta {
fromFile?: boolean;
hasUnsavedFolderChange?: boolean;
annotationsPermissions?: AnnotationsPermissions;
publicDashboardUid?: string;
publicDashboardEnabled?: boolean;
dashboardNotFound?: boolean;
isEmbedded?: boolean;

3
public/openapi3.json
View File

@ -4421,9 +4421,6 @@
"publicDashboardEnabled": {
"type": "boolean"
},
"publicDashboardUid": {
"type": "string"
},
"slug": {
"type": "string"
},