Merge branch '24836-tyeerror-e-is-null-when-clicking-plan-tab-in-cycle-analytics' into 'master'

Pick valid event objects for the events list ## What does this MR do? Fixes JS error when loading events with possible `null` objects ## What are the relevant issue numbers? Closes #24836 See merge request !7689

Merge branch '24836-tyeerror-e-is-null-when-clicking-plan-tab-in-cycle-analytics' into 'master'
bd6d0ce8 · Fatih Acet · 858602ea · 0a1f519c · bd6d0ce8
Commit bd6d0ce8 authored Nov 24, 2016 by Fatih Acet
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

cycle_analytics_store.js.es6 .../javascripts/cycle_analytics/cycle_analytics_store.js.es6 +6 -2

No files found.
--- a/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6
+++ b/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6
@@ -62,9 +62,11 @@
      this.state.events = this.decorateEvents(events);
    },
    decorateEvents(events) {
-      const newEvents = events;
+      const newEvents = [];
+
+      events.forEach((item) => {
+        if (!item) return;

-      newEvents.forEach((item) => {
        item.totalTime = item.total_time;
        item.author.webUrl = item.author.web_url;
        item.author.avatarUrl = item.author.avatar_url;
@@ -79,6 +81,8 @@
        delete item.created_at;
        delete item.short_sha;
        delete item.commit_url;
+
+        newEvents.push(item);
      });

      return newEvents;