Merge branch 'master' into enhancement/allow-filter-dashboard-by-comm…

…ander
Netflix · Sep 22, 2023 · ca60aa7 · ca60aa7
2 parents 720c8d5 + db544b0
commit ca60aa7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/requirements-base.txt b/requirements-base.txt
@@ -122,7 +122,7 @@ frozenlist==1.4.0
     #   aiosignal
 google-api-core==2.11.1
     # via google-api-python-client
-google-api-python-client==2.99.0
+google-api-python-client==2.100.0
     # via -r requirements-base.in
 google-auth==2.22.0
     # via
@@ -218,7 +218,7 @@ murmurhash==1.0.9
     #   preshed
     #   spacy
     #   thinc
-numpy==1.25.2
+numpy==1.26.0
     # via
     #   -r requirements-base.in
     #   blis
@@ -245,7 +245,7 @@ packaging==23.1
     #   spacy
     #   statsmodels
     #   thinc
-pandas==2.1.0
+pandas==2.1.1
     # via
     #   -r requirements-base.in
     #   statsmodels

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -34,7 +34,7 @@ executing==1.2.0
     #   stack-data
 factory-boy==3.3.0
     # via -r requirements-dev.in
-faker==19.6.1
+faker==19.6.2
     # via
     #   -r requirements-dev.in
     #   factory-boy
@@ -90,7 +90,7 @@ python-dateutil==2.8.2
     # via faker
 pyyaml==6.0.1
     # via pre-commit
-ruff==0.0.289
+ruff==0.0.290
     # via -r requirements-dev.in
 six==1.16.0
     # via

diff --git a/src/dispatch/incident/service.py b/src/dispatch/incident/service.py
@@ -289,9 +289,8 @@ def update(*, db_session, incident: Incident, incident_in: IncidentUpdate) -> In
         incident_severity_in=incident_in.incident_severity,
     )
 
-    if incident_in.status == IncidentStatus.stable:
-        if incident.project.stable_priority:
-            incident_priority = incident.project.stable_priority
+    if incident_in.status == IncidentStatus.stable and incident.project.stable_priority:
+        incident_priority = incident.project.stable_priority
     else:
         incident_priority = incident_priority_service.get_by_name_or_default(
             db_session=db_session,

diff --git a/src/dispatch/plugins/dispatch_slack/feedback/interactive.py b/src/dispatch/plugins/dispatch_slack/feedback/interactive.py
@@ -275,6 +275,7 @@ def oncall_shift_feedback_input(
             initial_value=initial_value,
             multiline=True,
             placeholder="How would you describe your experience?",
+            optional=True,
         ),
         label=label,
         **kwargs,
@@ -381,7 +382,7 @@ def handle_oncall_shift_feedback_submission_event(
 
     ack_oncall_shift_feedback_submission_event(ack=ack)
 
-    feedback = form_data.get(ServiceFeedbackNotificationBlockIds.feedback_input)
+    feedback = form_data.get(ServiceFeedbackNotificationBlockIds.feedback_input, "")
     rating = form_data.get(ServiceFeedbackNotificationBlockIds.rating_select, {}).get("value")
 
     # metadata is organization_slug|project_id|schedule_id|shift_end_at|reminder_id