Don't use LegacyURI Redirect if in screenshot mode

elastic · Sep 14, 2021 · 33e8fdb · 33e8fdb
1 parent d98ad63
commit 33e8fdb
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/src/plugins/dashboard/kibana.json b/src/plugins/dashboard/kibana.json
@@ -19,7 +19,13 @@
     "presentationUtil",
     "visualizations"
   ],
-  "optionalPlugins": ["home", "spaces", "savedObjectsTaggingOss", "usageCollection"],
+  "optionalPlugins": [
+    "home",
+    "spaces",
+    "savedObjectsTaggingOss",
+    "screenshotMode",
+    "usageCollection"
+  ],
   "server": true,
   "ui": true,
   "requiredBundles": ["home", "kibanaReact", "kibanaUtils", "presentationUtil"]

diff --git a/src/plugins/dashboard/public/application/dashboard_router.tsx b/src/plugins/dashboard/public/application/dashboard_router.tsx
@@ -84,6 +84,7 @@ export async function mountApp({
     savedObjectsTaggingOss,
     visualizations,
     presentationUtil,
+    screenshotMode,
   } = pluginsStart;
 
   const activeSpaceId =
@@ -130,6 +131,7 @@ export async function mountApp({
       activeSpaceId || 'default'
     ),
     spacesService: spacesApi,
+    screenshotModeService: screenshotMode,
   };
 
   const getUrlStateStorage = (history: RouteComponentProps['history']) =>

diff --git a/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts
@@ -92,6 +92,7 @@ export const useDashboardAppState = ({
     dashboardSessionStorage,
     scopedHistory,
     spacesService,
+    screenshotModeService,
   } = services;
   const { docTitle } = chrome;
   const { notifications } = core;
@@ -151,7 +152,11 @@ export const useDashboardAppState = ({
 
       // If the saved dashboard is an alias match, then we will redirect
       if (savedDashboard.outcome === 'aliasMatch') {
-        spacesService?.ui.redirectLegacyUrl(savedDashboard.getFullPath());
+        if (screenshotModeService?.isScreenshotMode()) {
+          scopedHistory().replace(savedDashboard.getFullPath());
+        } else {
+          spacesService?.ui.redirectLegacyUrl(savedDashboard.getFullPath());
+        }
       }
 
       /**
@@ -344,6 +349,7 @@ export const useDashboardAppState = ({
     query,
     data,
     spacesService?.ui,
+    screenshotModeService,
   ]);
 
   /**

diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
@@ -12,6 +12,7 @@ import { filter, map } from 'rxjs/operators';
 
 import { Start as InspectorStartContract } from 'src/plugins/inspector/public';
 import { UrlForwardingSetup, UrlForwardingStart } from 'src/plugins/url_forwarding/public';
+import { ScreenshotModePluginStart } from 'src/plugins/screenshot_mode/public';
 import { APP_WRAPPER_CLASS } from '../../../core/public';
 import {
   App,
@@ -118,6 +119,7 @@ export interface DashboardStartDependencies {
   savedObjects: SavedObjectsStart;
   presentationUtil: PresentationUtilPluginStart;
   savedObjectsTaggingOss?: SavedObjectTaggingOssPluginStart;
+  screenshotMode?: ScreenshotModePluginStart;
   spaces?: SpacesPluginStart;
   visualizations: VisualizationsStart;
 }

diff --git a/src/plugins/dashboard/public/types.ts b/src/plugins/dashboard/public/types.ts
@@ -19,6 +19,7 @@ import type {
 import { History } from 'history';
 import { AnyAction, Dispatch } from 'redux';
 import { BehaviorSubject, Subject } from 'rxjs';
+import { ScreenshotModePluginStart } from 'src/plugins/screenshot_mode/public';
 import { Query, Filter, IndexPattern, RefreshInterval, TimeRange } from './services/data';
 import { ContainerInput, EmbeddableInput, ViewMode } from './services/embeddable';
 import { SharePluginStart } from './services/share';
@@ -205,4 +206,5 @@ export interface DashboardAppServices {
   setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
   savedQueryService: DataPublicPluginStart['query']['savedQueries'];
   spacesService?: SpacesPluginStart;
+  screenshotModeService?: ScreenshotModePluginStart;
 }