fix(Peer Chat): Null pointer when manual assignment and not grouped (#…

…596)
WISE-Community · May 17, 2022 · c1f49d6 · c1f49d6
1 parent 9978839
commit c1f49d6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/assets/wise5/components/peerChat/peer-chat-student/peer-chat-student.component.ts b/src/assets/wise5/components/peerChat/peer-chat-student/peer-chat-student.component.ts
@@ -97,11 +97,13 @@ export class PeerChatStudentComponent extends ComponentStudent {
       .subscribe(
         (peerGroup: PeerGroup) => {
           this.isPeerChatWorkgroupsResponseReceived = true;
-          this.peerGroup = peerGroup;
-          const peerGroupWorkgroupIds = this.getPeerGroupWorkgroupIds(peerGroup);
-          this.addTeacherWorkgroupIds(peerGroupWorkgroupIds);
-          this.setPeerChatWorkgroups(peerGroupWorkgroupIds);
-          this.getPeerChatComponentStates(peerGroup);
+          if (peerGroup != null) {
+            this.peerGroup = peerGroup;
+            const peerGroupWorkgroupIds = this.getPeerGroupWorkgroupIds(peerGroup);
+            this.addTeacherWorkgroupIds(peerGroupWorkgroupIds);
+            this.setPeerChatWorkgroups(peerGroupWorkgroupIds);
+            this.getPeerChatComponentStates(peerGroup);
+          }
         },
         (error) => {
           this.isPeerChatWorkgroupsResponseReceived = true;

diff --git a/src/messages.xlf b/src/messages.xlf
@@ -15014,7 +15014,7 @@ If this problem continues, let your teacher know and move on to the next activit
         <source>You have new chat messages</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/peerChat/peer-chat-student/peer-chat-student.component.ts</context>
-          <context context-type="linenumber">209</context>
+          <context context-type="linenumber">211</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6310961320545154131" datatype="html">