mirror of https://github.com/apache/superset.git
feat: configure force_screenshot (#17855)
* Update existing tests * Add backend test * feat: add force option to report screenshots * Add tests * Rebase fixes * Do not force screenshot on dashboard alerts * feat: bypass cache on screenshots for alerts * Update existing tests * Add tests * feat: configure force_screenshot
This commit is contained in:
Beto Dealmeida
GitHub
parent
2cd8054358
commit
9baeafec93
|
|
@ -42,6 +42,7 @@ import Select, { propertyComparator } from 'src/components/Select/Select';
|
|||
import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';
|
||||
import withToasts from 'src/components/MessageToasts/withToasts';
|
||||
import Owner from 'src/types/Owner';
|
||||
import { Checkbox } from 'src/common/components';
|
||||
import TextAreaControl from 'src/explore/components/controls/TextAreaControl';
|
||||
import { useCommonConf } from 'src/views/CRUD/data/database/state';
|
||||
import {
|
||||
|
|
@ -341,6 +342,10 @@ const StyledRadioGroup = styled(Radio.Group)`
|
|||
margin-left: ${({ theme }) => theme.gridUnit * 5.5}px;
|
||||
`;
|
||||
|
||||
const StyledCheckbox = styled(Checkbox)`
|
||||
margin-left: ${({ theme }) => theme.gridUnit * 5.5}px;
|
||||
`;
|
||||
|
||||
// Notification Method components
|
||||
const StyledNotificationAddButton = styled.div`
|
||||
color: ${({ theme }) => theme.colors.primary.dark1};
|
||||
|
|
@ -417,6 +422,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
|
|||
const [reportFormat, setReportFormat] = useState<string>(
|
||||
DEFAULT_NOTIFICATION_FORMAT,
|
||||
);
|
||||
const [forceScreenshot, setForceScreenshot] = useState<boolean>(false);
|
||||
|
||||
// Dropdown options
|
||||
const [conditionNotNull, setConditionNotNull] = useState<boolean>(false);
|
||||
|
|
@ -513,7 +519,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
|
|||
const data: any = {
|
||||
...currentAlert,
|
||||
type: isReport ? 'Report' : 'Alert',
|
||||
force_screenshot: contentType === 'chart' && !isReport ? 'true' : 'false',
|
||||
force_screenshot: forceScreenshot ? 'true' : 'false',
|
||||
validator_type: conditionNotNull ? 'not null' : 'operator',
|
||||
validator_config_json: conditionNotNull
|
||||
? {}
|
||||
|
|
@ -866,6 +872,10 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
|
|||
setReportFormat(target.value);
|
||||
};
|
||||
|
||||
const onForceScreenshotChange = (event: any) => {
|
||||
setForceScreenshot(event.target.checked);
|
||||
};
|
||||
|
||||
// Make sure notification settings has the required info
|
||||
const checkNotificationSettings = () => {
|
||||
if (!notificationSettings.length) {
|
||||
|
|
@ -927,6 +937,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
|
|||
(!currentAlert || currentAlert.id || (isHidden && show))
|
||||
) {
|
||||
setCurrentAlert({ ...DEFAULT_ALERT });
|
||||
setForceScreenshot(contentType === 'chart' && !isReport);
|
||||
setNotificationSettings([]);
|
||||
setNotificationAddState('active');
|
||||
}
|
||||
|
|
@ -970,6 +981,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
|
|||
if (resource.chart) {
|
||||
setChartVizType((resource.chart as ChartObject).viz_type);
|
||||
}
|
||||
setForceScreenshot(resource.force_screenshot);
|
||||
|
||||
setCurrentAlert({
|
||||
...resource,
|
||||
|
|
@ -1339,18 +1351,33 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
|
|||
onChange={onDashboardChange}
|
||||
/>
|
||||
{formatOptionEnabled && (
|
||||
<div className="inline-container">
|
||||
<StyledRadioGroup
|
||||
onChange={onFormatChange}
|
||||
value={reportFormat}
|
||||
>
|
||||
<StyledRadio value="PNG">{t('Send as PNG')}</StyledRadio>
|
||||
<StyledRadio value="CSV">{t('Send as CSV')}</StyledRadio>
|
||||
{TEXT_BASED_VISUALIZATION_TYPES.includes(chartVizType) && (
|
||||
<StyledRadio value="TEXT">{t('Send as text')}</StyledRadio>
|
||||
)}
|
||||
</StyledRadioGroup>
|
||||
</div>
|
||||
<>
|
||||
<div className="inline-container">
|
||||
<StyledRadioGroup
|
||||
onChange={onFormatChange}
|
||||
value={reportFormat}
|
||||
>
|
||||
<StyledRadio value="PNG">{t('Send as PNG')}</StyledRadio>
|
||||
<StyledRadio value="CSV">{t('Send as CSV')}</StyledRadio>
|
||||
{TEXT_BASED_VISUALIZATION_TYPES.includes(chartVizType) && (
|
||||
<StyledRadio value="TEXT">
|
||||
{t('Send as text')}
|
||||
</StyledRadio>
|
||||
)}
|
||||
</StyledRadioGroup>
|
||||
</div>
|
||||
{isReport && (
|
||||
<div className="inline-container">
|
||||
<StyledCheckbox
|
||||
className="checkbox"
|
||||
checked={forceScreenshot}
|
||||
onChange={onForceScreenshotChange}
|
||||
>
|
||||
Ignore cache when generating screenshot
|
||||
</StyledCheckbox>
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
<StyledSectionTitle>
|
||||
<h4>{t('Notification method')}</h4>
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ export type AlertObject = {
|
|||
dashboard?: MetaObject;
|
||||
database?: MetaObject;
|
||||
description?: string;
|
||||
force_screenshot: boolean;
|
||||
grace_period?: number;
|
||||
id: number;
|
||||
last_eval_dttm?: number;
|
||||
|
|
|
|||
|
|
@ -92,6 +92,7 @@ class ReportScheduleRestApi(BaseSupersetModelRestApi):
|
|||
"database.database_name",
|
||||
"database.id",
|
||||
"description",
|
||||
"force_screenshot",
|
||||
"grace_period",
|
||||
"last_eval_dttm",
|
||||
"last_state",
|
||||
|
|
@ -151,6 +152,7 @@ class ReportScheduleRestApi(BaseSupersetModelRestApi):
|
|||
"dashboard",
|
||||
"database",
|
||||
"description",
|
||||
"force_screenshot",
|
||||
"grace_period",
|
||||
"log_retention",
|
||||
"name",
|
||||
|
|
|
|||
|
|
@ -146,8 +146,6 @@ class BaseReportState:
|
|||
"""
|
||||
Get the url for this report schedule: chart or dashboard
|
||||
"""
|
||||
# For alerts we always want to send a fresh screenshot, bypassing
|
||||
# the cache.
|
||||
force = "true" if self._report_schedule.force_screenshot else "false"
|
||||
|
||||
if self._report_schedule.chart:
|
||||
|
|
|
|||
Loading…
Reference in New Issue