fix(AlertsReports): making log retention "None" option valid (apache#…

…27554)
jzhao62 · May 16, 2024 · 7246627 · 7246627
1 parent 046e1e2
commit 7246627
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/superset-frontend/src/features/alerts/AlertReportModal.tsx b/superset-frontend/src/features/alerts/AlertReportModal.tsx
@@ -1622,11 +1622,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
                 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
@@ -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
@@ -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},