Scenes: Remove old scenes stuff (grafana#79760)

* Scenes: Remove old scenes stuff

* Fixes

* Fixes

* update

Author: torkelo

.github/CODEOWNERS

@@ -413,7 +413,6 @@ cypress.config.js @grafana/grafana-frontend-platform
 /public/app/features/runtime/ @ryantxu
 /public/app/features/query/ @grafana/dashboards-squad
 /public/app/features/sandbox/ @grafana/grafana-frontend-platform
-/public/app/features/scenes/ @grafana/dashboards-squad
 /public/app/features/browse-dashboards/ @grafana/grafana-frontend-platform
 /public/app/features/search/ @grafana/grafana-frontend-platform
 /public/app/features/serviceaccounts/ @grafana/identity-access-team

pkg/services/navtree/navtreeimpl/navtree.go

@@ -368,15 +368,6 @@ func (s *ServiceImpl) buildDashboardNavLinks(c *contextmodel.ReqContext) []*navt
 		}
 	}
 
-	if s.features.IsEnabled(c.Req.Context(), featuremgmt.FlagScenes) {
-		dashboardChildNavs = append(dashboardChildNavs, &navtree.NavLink{
-			Text: "Scenes",
-			Id:   "scenes",
-			Url:  s.cfg.AppSubURL + "/scenes",
-			Icon: "apps",
-		})
-	}
-
 	if s.features.IsEnabled(c.Req.Context(), featuremgmt.FlagDatatrails) {
 		dashboardChildNavs = append(dashboardChildNavs, &navtree.NavLink{
 			Text: "Data trails",

public/app/features/dashboard-scene/panel-edit/PanelEditor.tsx

@@ -121,7 +121,6 @@ export class PanelEditor extends SceneObjectBase<PanelEditorState> {
       getDashboardUrl({
         uid: this.state.dashboardRef.resolve().state.uid,
         currentQueryParams: locationService.getLocation().search,
-        useExperimentalURL: true,
       })
     );
   }

public/app/features/dashboard-scene/scene/DashboardScene.tsx

@@ -2,7 +2,7 @@ import * as H from 'history';
 import { Unsubscribable } from 'rxjs';
 
 import { CoreApp, DataQueryRequest, NavIndex, NavModelItem } from '@grafana/data';
-import { config, locationService } from '@grafana/runtime';
+import { locationService } from '@grafana/runtime';
 import {
   getUrlSyncManager,
   SceneFlexLayout,
@@ -195,7 +195,6 @@ export class DashboardScene extends SceneObjectBase<DashboardSceneState> {
         uid: this.state.uid,
         currentQueryParams: location.search,
         updateQuery: { viewPanel: null, inspect: null, editview: null },
-        useExperimentalURL: Boolean(config.featureToggles.dashboardSceneForViewers && meta.canEdit),
       }),
     };
 

public/app/features/dashboard-scene/scene/PanelMenuBehavior.test.tsx

@@ -54,7 +54,7 @@ describe('panelMenuBehavior', () => {
   });
 
   beforeAll(() => {
-    locationService.push('/scenes/dashboard/dash-1?from=now-5m&to=now');
+    locationService.push('/d/dash-1?from=now-5m&to=now');
   });
 
   it('Given standard panel', async () => {
@@ -71,9 +71,9 @@ describe('panelMenuBehavior', () => {
 
     expect(menu.state.items?.length).toBe(6);
     // verify view panel url keeps url params and adds viewPanel=<panel-key>
-    expect(menu.state.items?.[0].href).toBe('/scenes/dashboard/dash-1?from=now-5m&to=now&viewPanel=panel-12');
+    expect(menu.state.items?.[0].href).toBe('/d/dash-1?from=now-5m&to=now&viewPanel=panel-12');
     // verify edit url keeps url time range
-    expect(menu.state.items?.[1].href).toBe('/scenes/dashboard/dash-1/panel-edit/12?from=now-5m&to=now');
+    expect(menu.state.items?.[1].href).toBe('/d/dash-1/panel-edit/12?from=now-5m&to=now');
     // verify share
     expect(menu.state.items?.[2].text).toBe('Share');
     // verify explore url
@@ -86,7 +86,7 @@ describe('panelMenuBehavior', () => {
     expect(getExploreArgs.scopedVars?.__sceneObject?.value).toBe(panel);
 
     // verify inspect url keeps url params and adds inspect=<panel-key>
-    expect(menu.state.items?.[4].href).toBe('/scenes/dashboard/dash-1?from=now-5m&to=now&inspect=panel-12');
+    expect(menu.state.items?.[4].href).toBe('/d/dash-1?from=now-5m&to=now&inspect=panel-12');
     expect(menu.state.items?.[4].subMenu).toBeDefined();
 
     expect(menu.state.items?.[4].subMenu?.length).toBe(3);

public/app/features/dashboard-scene/scene/PanelMenuBehavior.tsx

@@ -71,7 +71,6 @@ export function panelMenuBehavior(menu: VizPanelMenu) {
             uid: dashboard.state.uid,
             subPath: `/panel-edit/${panelId}`,
             currentQueryParams: location.search,
-            useExperimentalURL: true,
           }),
         });
       }

public/app/features/dashboard-scene/sharing/ShareLinkTab.test.tsx

@@ -30,15 +30,15 @@ describe('ShareLinkTab', () => {
     config.rendererAvailable = true;
     config.bootData.user.orgId = 1;
     config.featureToggles.dashboardSceneForViewers = true;
-    locationService.push('/scenes/dashboard/dash-1?from=now-6h&to=now');
+    locationService.push('/d/dash-1?from=now-6h&to=now');
   });
 
   describe('with locked time range (absolute) range', () => {
     it('should generate share url absolute time', async () => {
       buildAndRenderScenario({});
 
       expect(await screen.findByRole('textbox', { name: 'Link URL' })).toHaveValue(
-        'http://dashboards.grafana.com/grafana/scenes/dashboard/dash-1?from=2019-02-11T13:00:00.000Z&to=2019-02-11T19:00:00.000Z&viewPanel=panel-12'
+        'http://dashboards.grafana.com/grafana/d/dash-1?from=2019-02-11T13:00:00.000Z&to=2019-02-11T19:00:00.000Z&viewPanel=panel-12'
       );
     });
   });
@@ -49,7 +49,7 @@ describe('ShareLinkTab', () => {
       act(() => tab.onToggleLockedTime());
 
       expect(await screen.findByRole('textbox', { name: 'Link URL' })).toHaveValue(
-        'http://dashboards.grafana.com/grafana/scenes/dashboard/dash-1?from=now-6h&to=now&viewPanel=panel-12'
+        'http://dashboards.grafana.com/grafana/d/dash-1?from=now-6h&to=now&viewPanel=panel-12'
       );
     });
   });
@@ -59,7 +59,7 @@ describe('ShareLinkTab', () => {
     act(() => tab.onThemeChange('light'));
 
     expect(await screen.findByRole('textbox', { name: 'Link URL' })).toHaveValue(
-      'http://dashboards.grafana.com/grafana/scenes/dashboard/dash-1?from=2019-02-11T13:00:00.000Z&to=2019-02-11T19:00:00.000Z&viewPanel=panel-12&theme=light'
+      'http://dashboards.grafana.com/grafana/d/dash-1?from=2019-02-11T13:00:00.000Z&to=2019-02-11T19:00:00.000Z&viewPanel=panel-12&theme=light'
     );
   });
 

public/app/features/dashboard-scene/sharing/ShareLinkTab.tsx

@@ -76,7 +76,6 @@ export class ShareLinkTab extends SceneObjectBase<ShareLinkTabState> {
       currentQueryParams: location.search,
       updateQuery: urlParamsUpdate,
       absolute: true,
-      useExperimentalURL: Boolean(config.featureToggles.dashboardSceneForViewers && dashboard.state.meta.canEdit),
     });
 
     if (useShortUrl) {

public/app/features/dashboard-scene/utils/urlBuilders.test.ts

@@ -2,30 +2,28 @@ import { getDashboardUrl } from './urlBuilders';
 
 describe('dashboard utils', () => {
   it('Can getUrl', () => {
-    const url = getDashboardUrl({ uid: 'dash-1', currentQueryParams: '?orgId=1&filter=A', useExperimentalURL: true });
+    const url = getDashboardUrl({ uid: 'dash-1', currentQueryParams: '?orgId=1&filter=A' });
 
-    expect(url).toBe('/scenes/dashboard/dash-1?orgId=1&filter=A');
+    expect(url).toBe('/d/dash-1?orgId=1&filter=A');
   });
 
   it('Can getUrl with subpath', () => {
     const url = getDashboardUrl({
       uid: 'dash-1',
       subPath: '/panel-edit/2',
       currentQueryParams: '?orgId=1&filter=A',
-      useExperimentalURL: true,
     });
 
-    expect(url).toBe('/scenes/dashboard/dash-1/panel-edit/2?orgId=1&filter=A');
+    expect(url).toBe('/d/dash-1/panel-edit/2?orgId=1&filter=A');
   });
 
   it('Can getUrl with params removed and addded', () => {
     const url = getDashboardUrl({
       uid: 'dash-1',
       currentQueryParams: '?orgId=1&filter=A',
       updateQuery: { filter: null, new: 'A' },
-      useExperimentalURL: true,
     });
 
-    expect(url).toBe('/scenes/dashboard/dash-1?orgId=1&new=A');
+    expect(url).toBe('/d/dash-1?orgId=1&new=A');
   });
 });

public/app/features/dashboard-scene/utils/urlBuilders.ts

@@ -21,15 +21,10 @@ export interface DashboardUrlOptions {
   absolute?: boolean;
   // Add tz to query params
   timeZone?: string;
-
-  // Add tz to query params
-  useExperimentalURL?: boolean;
 }
 
 export function getDashboardUrl(options: DashboardUrlOptions) {
-  let path = options.useExperimentalURL
-    ? `/scenes/dashboard/${options.uid}${options.subPath ?? ''}`
-    : `/d/${options.uid}${options.subPath ?? ''}`;
+  let path = `/d/${options.uid}${options.subPath ?? ''}`;
 
   if (options.soloRoute) {
     path = `/d-solo/${options.uid}${options.subPath ?? ''}`;