Merge pull request #986 from target/fix-alert-log-nil-pointer

alert log: return no status if message is unavailable
target · Nov 3, 2020 · 6881399 · 6881399
2 parents 9c687a4 + 127d045
commit 6881399
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/graphql2/graphqlapp/alert.go b/graphql2/graphqlapp/alert.go
@@ -105,6 +105,9 @@ func (a *AlertLogEntry) notificationSentState(ctx context.Context, obj *alertlog
 	if err != nil {
 		return nil, errors.Wrap(err, "find alert log state")
 	}
+	if s == nil {
+		return nil, nil
+	}
 
 	return notificationStateFromStatus(*s), nil
 }

diff --git a/web/src/cypress/support/form.ts b/web/src/cypress/support/form.ts
@@ -81,7 +81,7 @@ function materialCalendar(date: string | DateTime): void {
         .should(
           'contain',
           displayedDT
-            .plus({ months: (diff < 0 ? -1 : 1) * i + 1 })
+            .plus({ months: (diff < 0 ? -1 : 1) * (i + 1) })
             .toFormat('MMMM'),
         )
         .should(