From 72466279303f140d13866d55ead255e7af8a49d0 Mon Sep 17 00:00:00 2001 From: Jack <41238731+fisjac@users.noreply.github.com> Date: Tue, 23 Apr 2024 08:05:00 -0500 Subject: [PATCH] fix(AlertsReports): making log retention "None" option valid (#27554) --- superset-frontend/src/features/alerts/AlertReportModal.tsx | 6 +----- superset/commands/report/log_prune.py | 1 + superset/reports/schemas.py | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/superset-frontend/src/features/alerts/AlertReportModal.tsx b/superset-frontend/src/features/alerts/AlertReportModal.tsx index 50e2380b5fe3b..7b0e4c5af8e66 100644 --- a/superset-frontend/src/features/alerts/AlertReportModal.tsx +++ b/superset-frontend/src/features/alerts/AlertReportModal.tsx @@ -1622,11 +1622,7 @@ const AlertReportModal: FunctionComponent = ({ ariaLabel={t('Log retention')} placeholder={t('Log retention')} onChange={onLogRetentionChange} - value={ - typeof currentAlert?.log_retention === 'number' - ? currentAlert?.log_retention - : ALERT_REPORTS_DEFAULT_RETENTION - } + value={currentAlert?.log_retention} options={RETENTION_OPTIONS} sortComparator={propertyComparator('value')} /> diff --git a/superset/commands/report/log_prune.py b/superset/commands/report/log_prune.py index 610519ba90803..f14f7856a1e15 100644 --- a/superset/commands/report/log_prune.py +++ b/superset/commands/report/log_prune.py @@ -48,6 +48,7 @@ def run(self) -> None: row_count = ReportScheduleDAO.bulk_delete_logs( report_schedule, from_date, commit=False ) + db.session.commit() logger.info( "Deleted %s logs for report schedule id: %s", str(row_count), diff --git a/superset/reports/schemas.py b/superset/reports/schemas.py index 286322a2daa16..64b56ec35a0be 100644 --- a/superset/reports/schemas.py +++ b/superset/reports/schemas.py @@ -320,7 +320,7 @@ class ReportSchedulePutSchema(Schema): log_retention = fields.Integer( metadata={"description": log_retention_description, "example": 90}, required=False, - validate=[Range(min=1, error=_("Value must be greater than 0"))], + validate=[Range(min=0, error=_("Value must be 0 or greater"))], ) grace_period = fields.Integer( metadata={"description": grace_period_description, "example": 60 * 60 * 4},