fix(alerts&reports): Alerts & Reports will use values from WEBDRIVER_WINDOW option

superset/reports/commands/execute.py

@@ -152,11 +152,19 @@ def _get_screenshot(self) -> ScreenshotData:
         screenshot: Optional[BaseScreenshot] = None
         if self._report_schedule.chart:
             url = self._get_url(standalone="true")
-            screenshot = ChartScreenshot(url, self._report_schedule.chart.digest)
+            screenshot = ChartScreenshot(
+                url,
+                self._report_schedule.chart.digest,
+                window_size=app.config["WEBDRIVER_WINDOW"]["slice"],
+                thumb_size=app.config["WEBDRIVER_WINDOW"]["slice"],
+            )
         else:
             url = self._get_url()
             screenshot = DashboardScreenshot(
-                url, self._report_schedule.dashboard.digest
+                url,
+                self._report_schedule.dashboard.digest,
+                window_size=app.config["WEBDRIVER_WINDOW"]["dashboard"],
+                thumb_size=app.config["WEBDRIVER_WINDOW"]["dashboard"],
             )
         image_url = self._get_url(user_friendly=True)
         user = self._get_screenshot_user()

superset/tasks/thumbnails.py

@@ -44,7 +44,7 @@ def cache_chart_thumbnail(
             logger.warning("No cache set, refusing to compute")
             return None
         logger.info("Caching chart: %s", url)
-        screenshot = ChartScreenshot(url, digest)
+        screenshot = ChartScreenshot(url, digest, (800, 600), (800, 600))
         with session_scope(nullpool=True) as session:
             user = security_manager.get_user_by_username(
                 current_app.config["THUMBNAIL_SELENIUM_USER"], session=session
@@ -68,7 +68,7 @@ def cache_dashboard_thumbnail(
             logging.warning("No cache set, refusing to compute")
             return
         logger.info("Caching dashboard: %s", url)
-        screenshot = DashboardScreenshot(url, digest)
+        screenshot = DashboardScreenshot(url, digest, (1600, 1200), (800, 600))
         with session_scope(nullpool=True) as session:
             user = security_manager.get_user_by_username(
                 current_app.config["THUMBNAIL_SELENIUM_USER"], session=session

superset/utils/screenshots.py

@@ -195,12 +195,34 @@ def resize_image(
 class ChartScreenshot(BaseScreenshot):
     thumbnail_type: str = "chart"
     element: str = "chart-container"
-    window_size: WindowSize = (800, 600)
-    thumb_size: WindowSize = (800, 600)
+
+    def __init__(
+        self,
+        url: str,
+        digest: str,
+        window_size: Optional[WindowSize] = None,
+        thumb_size: Optional[WindowSize] = None,
+    ):
+        super().__init__(url, digest)
+        self.window_size = (
+            window_size or current_app.config["WEBDRIVER_WINDOW"]["slice"]
+        )
+        self.thumb_size = thumb_size or (800, 600)
 
 
 class DashboardScreenshot(BaseScreenshot):
     thumbnail_type: str = "dashboard"
     element: str = "grid-container"
-    window_size: WindowSize = (1600, int(1600 * 0.75))
-    thumb_size: WindowSize = (800, int(800 * 0.75))
+
+    def __init__(
+        self,
+        url: str,
+        digest: str,
+        window_size: Optional[WindowSize] = None,
+        thumb_size: Optional[WindowSize] = None,
+    ):
+        super().__init__(url, digest)
+        self.window_size = (
+            window_size or current_app.config["WEBDRIVER_WINDOW"]["dashboard"]
+        )
+        self.thumb_size = thumb_size or (800, 600)