Removed outer null check in getParentGroupId() and specified return types. Cleaned up test. #2396

Author: hirokiterashima

src/main/webapp/site/src/app/services/projectService.spec.ts

@@ -1109,15 +1109,14 @@ function consolidatePaths() {
 
 function getParentGroup() {
   describe('getParentGroup()', () => {
+    beforeEach(() => {
+      service.setProject(twoStepsProjectJSON);
+    });
     it('should get the parent group of an active node', () => {
-      service.setProject(oneBranchTwoPathsProjectJSON);
-      const parentGroup = service.getParentGroup('node1');
-      expect(parentGroup.id).toEqual('group1');
+      expect(service.getParentGroup('node1').id).toEqual('group1');
     });
     it('should get the parent group of an inactive node', () => {
-      service.setProject(twoStepsProjectJSON);
-      const parentGroup = service.getParentGroup('node3');
-      expect(parentGroup.id).toEqual('group2');
+      expect(service.getParentGroup('node3').id).toEqual('group2');
     });
   });
 }

src/main/webapp/wise5/services/projectService.ts

@@ -722,7 +722,7 @@ export class ProjectService {
     return nodeIcon;
   }
 
-  getParentGroup(nodeId = '') {
+  getParentGroup(nodeId = ''): any {
     const node = this.getNodeById(nodeId);
     if (node != null) {
       for (const groupNode of this.getGroupNodes()) {
@@ -739,12 +739,10 @@ export class ProjectService {
     return null;
   }
 
-  getParentGroupId(nodeId) {
-    if (nodeId != null) {
-      const parentGroup = this.getParentGroup(nodeId);
-      if (parentGroup != null) {
-        return parentGroup.id;
-      }
+  getParentGroupId(nodeId = ''): string {
+    const parentGroup = this.getParentGroup(nodeId);
+    if (parentGroup != null) {
+      return parentGroup.id;
     }
     return null;
   }