commit b84fe8ae8a6f56e161b4e81b711bf4be8cb16dc6
author Ben Rohlfs <brohlfs@google.com> Thu Jul 11 07:18:00 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 11 07:18:00 2019 +0000
tree b0169dd59afc5108dd82a7da09bf8d6e0ae7367d
parent e3137d733018ec482cfdd4dfc12b46ef715b2ac6
parent e770374b7da6bb8c6aa829d005bba412c5312a9f

Merge "gr-change-metadata: Add undefined checks"

polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata.js

diff --git a/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata.js b/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata.js
index 51fa1b0..154fc36 100644
--- a/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata.js
+++ b/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata.js
@@ -222,12 +222,14 @@
     },
 
     _showAddTopic(changeRecord, settingTopic) {
-      const hasTopic = !!changeRecord && !!changeRecord.base.topic;
+      const hasTopic = !!changeRecord &&
+          !!changeRecord.base && !!changeRecord.base.topic;
       return !hasTopic && !settingTopic;
     },
 
     _showTopicChip(changeRecord, settingTopic) {
-      const hasTopic = !!changeRecord && !!changeRecord.base.topic;
+      const hasTopic = !!changeRecord &&
+          !!changeRecord.base && !!changeRecord.base.topic;
       return hasTopic && !settingTopic;
     },
 
@@ -406,7 +408,7 @@
      * @return {Object|null} either an accound or null.
      */
     _getNonOwnerRole(change, role) {
-      if (!change.current_revision ||
+      if (!change || !change.current_revision ||
           !change.revisions[change.current_revision]) {
         return null;
       }