PR change requests complete

Author: Whitney Shake

src/dotnet/APIView/ClientSPA/src/app/_components/code-panel/code-panel.component.html

@@ -25,7 +25,7 @@
     <ng-container *ngIf="item.type === CodePanelRowDatatype.CommentThread">
       <app-comment-thread
         [codePanelRowData]="item"
-        [associatedCodeLine]="codePanelData!.nodeMetaData[item.nodeIdHashed]!.codeLines[item.associatedRowPositionInGroup]!"
+        [associatedCodeLine]="getAssociatedCodeLine(item)"
         (cancelCommentActionEmitter)="handleCancelCommentActionEmitter($event)"
         (saveCommentActionEmitter)="handleSaveCommentActionEmitter($event)"
         (deleteCommentActionEmitter)="handleDeleteCommentActionEmitter($event)"

src/dotnet/APIView/ClientSPA/src/app/_components/code-panel/code-panel.component.ts

@@ -136,6 +136,13 @@ export class CodePanelComponent implements OnChanges{
     return "";
   }
 
+  getAssociatedCodeLine(item: CodePanelRowData): CodePanelRowData | undefined {
+    if (this.codePanelData?.nodeMetaData && this.codePanelData.nodeMetaData[item.nodeIdHashed]) {
+      return this.codePanelData.nodeMetaData[item.nodeIdHashed].codeLines[item.associatedRowPositionInGroup] || undefined;
+    }
+    return undefined;
+  }
+  
   toggleNodeComments(target: Element) {
     const nodeIdHashed = target.closest('.code-line')!.getAttribute('data-node-id');
     const rowPositionInGroup = parseInt(target.closest('.code-line')!.getAttribute('data-row-position-in-group')!, 10);

src/dotnet/APIView/ClientSPA/src/app/_components/shared/comment-thread/comment-thread.component.ts

@@ -97,14 +97,15 @@ export class CommentThreadComponent {
         },
       ]
     });
-
     this.setCommentResolutionState();
   }
 
   ngOnChanges(changes: SimpleChanges) {
     if (changes['codePanelRowData']) {
       this.setCommentResolutionState();
     }
+    if (changes['associatedCodeLine']) {
+    }
   }
 
   setCommentResolutionState() {
@@ -170,17 +171,20 @@ export class CommentThreadComponent {
     const target = (event.originalEvent?.target as Element).closest("a") as Element;
     const commentId = target.getAttribute("data-item-id");
     const commentData = this.codePanelRowData?.comments?.find(comment => comment.id === commentId)?.commentText.replace(/<[^>]*>/g, '').trim();
-  
+
     const codeLineContent = this.associatedCodeLine 
-    ? this.associatedCodeLine.rowOfTokens
-        .filter(token => token.kind !== 'nonBreakingSpace')
-        .map(token => token.value)
-        .join('')
-    : '';
-  
-    const apiViewUrl = `${window.location.href.split("#")[0]}%23${encodeURIComponent(encodeURIComponent(event.item?.title!))}`;
-    const issueBody = encodeURIComponent(`\`\`\`${event.item?.title}\n${codeLineContent}\n\`\`\`\n#\n${commentData}\n#\n[Created from ApiView comment]\n(${apiViewUrl})`);
-  
+        ? this.associatedCodeLine.rowOfTokens
+            .filter(token => token.kind !== 'nonBreakingSpace')
+            .map(token => token.value)
+            .join(' ')
+            .replace(/\s+/g, ' ')
+            .trim()
+        : '';
+
+    const nodeId: string = this.codePanelRowData?.nodeId ?? 'defaultNodeId';
+    const apiViewUrl = `${window.location.href.split("#")[0]}&nId=${encodeURIComponent(nodeId)}`;
+    const issueBody = encodeURIComponent(`\`\`\`${event.item?.title}\n${codeLineContent}\n\`\`\`\n#\n${commentData}\n#\n[Created from ApiView comment](${apiViewUrl})`);
+
     window.open(`https://github.com/Azure/${repo}/issues/new?body=${issueBody}`, '_blank');
   }