PublicDashboards: Remove publicDashboardUid from DashboardMeta (#85126)

packages/grafana-runtime/src/analytics/types.ts

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

pkg/api/dtos/dashboard.go

@@ -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"`
 }
 

pkg/services/publicdashboards/api/query_test.go

@@ -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())

public/api-enterprise-spec.json

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

public/api-merged.json

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

public/app/features/dashboard/api/publicDashboardApi.ts

@@ -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,
           });
         }

public/app/types/dashboard.ts

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

public/openapi3.json

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