🐛 Fix reporting for dirty state

elastic · Apr 4, 2023 · fe0d606 · fe0d606
1 parent 23286a3
commit fe0d606
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx b/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
@@ -596,7 +596,8 @@ export const LensTopNavMenu = ({
                 currentDoc,
                 adHocDataViews: adHocDataViews.map((dataView) => dataView.toSpec()),
               },
-              shareUrlEnabled
+              shareUrlEnabled,
+              isCurrentStateDirty
             );
             const sharingData = {
               activeData,

diff --git a/x-pack/plugins/lens/public/app_plugin/share_action.ts b/x-pack/plugins/lens/public/app_plugin/share_action.ts
@@ -57,7 +57,8 @@ export function getLocatorParams(
     visualization,
     adHocDataViews,
     currentDoc,
-  }: ShareableConfiguration
+  }: ShareableConfiguration,
+  isDirty: boolean
 ) {
   const references = extractReferencesFromState({
     activeDatasources: Object.keys(datasourceStates).reduce(
@@ -95,26 +96,29 @@ export function getLocatorParams(
   return {
     shareURL: snapshotParams,
     // for reporting use the shorten version when available
-    reporting: currentDoc?.savedObjectId
-      ? {
-          filters,
-          query,
-          resolvedDateRange: getResolvedDateRange(data.query.timefilter.timefilter),
-          savedObjectId: currentDoc?.savedObjectId,
-        }
-      : snapshotParams,
+    reporting:
+      currentDoc?.savedObjectId && !isDirty
+        ? {
+            filters,
+            query,
+            resolvedDateRange: getResolvedDateRange(data.query.timefilter.timefilter),
+            savedObjectId: currentDoc?.savedObjectId,
+          }
+        : snapshotParams,
   };
 }
 
 export async function getShareURL(
   shortUrlService: (params: LensAppLocatorParams) => Promise<string>,
   services: Pick<LensAppServices, 'application' | 'data'>,
   configuration: ShareableConfiguration,
-  shareUrlEnabled: boolean
+  shareUrlEnabled: boolean,
+  isDirty: boolean
 ) {
   const { shareURL: locatorParams, reporting: reportingLocatorParams } = getLocatorParams(
     services.data,
-    configuration
+    configuration,
+    isDirty
   );
   return {
     shareableUrl: await (shareUrlEnabled ? shortUrlService(locatorParams) : undefined),

diff --git a/x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx b/x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx
@@ -118,7 +118,7 @@ export const reportingScreenshotShareProvider = ({
     });
 
     const jobProviderOptions: JobParamsProviderOptions = {
-      shareableUrl: shareableUrlForSavedObject ?? shareableUrl,
+      shareableUrl: isDirty ? shareableUrl : shareableUrlForSavedObject ?? shareableUrl,
       objectType,
       sharingData,
     };