Fix URLs.

Author: tjprescott

src/dotnet/APIView/ClientSPA/src/app/_components/review-page-options/review-page-options.component.ts

@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChange
 import { ActivatedRoute, Router } from '@angular/router';
 import { ToggleSwitchChangeEvent } from 'primeng/toggleswitch';
 import { getQueryParams } from 'src/app/_helpers/router-helpers';
-import { CodeLineRowNavigationDirection, FULL_DIFF_STYLE, getAIReviewNotifiationInfo, mapLanguageAliases, TREE_DIFF_STYLE } from 'src/app/_helpers/common-helpers';
+import { CodeLineRowNavigationDirection, FULL_DIFF_STYLE, getAIReviewNotificationInfo, mapLanguageAliases, TREE_DIFF_STYLE } from 'src/app/_helpers/common-helpers';
 import { Review } from 'src/app/_models/review';
 import { APIRevision } from 'src/app/_models/revision';
 import { ConfigService } from 'src/app/_services/config/config.service';
@@ -577,7 +577,7 @@ export class ReviewPageOptionsComponent implements OnInit, OnChanges {
             this.aiReviewGenerationState = 'Failed';
             this.generateAIReviewButtonText = 'Failed to generate copilot review';
           }
-          const notificationInfo = getAIReviewNotifiationInfo(aiReviewUpdate, window.location.origin);
+          const notificationInfo = getAIReviewNotificationInfo(aiReviewUpdate, window.location.origin);
           if (notificationInfo) {
             if (aiReviewUpdate.apirevisionId === this.activeAPIRevision?.id) {
               this.messageService.add(notificationInfo[1]);
@@ -642,7 +642,10 @@ export class ReviewPageOptionsComponent implements OnInit, OnChanges {
   }
 
   getPullRequestsOfAssociatedAPIRevisionsUrl(pr: PullRequestModel) {
-    return `${window.location.origin}/review/${pr.reviewId}?activeApiRevisionId=${pr.apiRevisionId}`;
+    const baseHref = document.querySelector('base')?.getAttribute('href') || '/';
+    const cleanOrigin = window.location.origin.replace(/\/$/, '');
+    const cleanBaseHref = baseHref.replace(/\/$/, '');
+    return `${cleanOrigin}${cleanBaseHref}/review/${pr.reviewId}?activeApiRevisionId=${pr.apiRevisionId}`;
   }
 
    /**

src/dotnet/APIView/ClientSPA/src/app/_helpers/common-helpers.ts

@@ -27,12 +27,12 @@ export function getLanguageCssSafeName(language: string): string {
       return "cplusplus";
     default:
       return language.toLowerCase();
-  }   
+  }
 }
 
 export function mapLanguageAliases(languages: Iterable<string>): string[] {
   const result: Set<string> = new Set<string>();
-  
+
   for (const language of languages) {
     if (language === "TypeSpec" || language === "Cadl") {
       result.add("Cadl");
@@ -86,12 +86,15 @@ export function getSupportedLanguages(): any {
   ];
 }
 
-export function getAIReviewNotifiationInfo(jobInfo : AIReviewJobCompletedDto, origin: string): [SiteNotification, any] | undefined {
+export function getAIReviewNotificationInfo(jobInfo : AIReviewJobCompletedDto, origin: string): [SiteNotification, any] | undefined {
   if (jobInfo.status == 'Success' && jobInfo.noOfGeneratedComments > 0) {
     const messageData : ToastMessageData = {
       action: 'RefreshPage',
     };
-    const pageUrl = `${origin}/review/${jobInfo.reviewId}?activeApiRevisionId=${jobInfo.apirevisionId}`;
+    const baseHref = document.querySelector('base')?.getAttribute('href') || '/';
+    const cleanOrigin = origin.replace(/\/$/, '');
+    const cleanBaseHref = baseHref.replace(/\/$/, '');
+    const pageUrl = `${cleanOrigin}${cleanBaseHref}/review/${jobInfo.reviewId}?activeApiRevisionId=${jobInfo.apirevisionId}`;
     const messagePart = (jobInfo.noOfGeneratedComments === 1) ? "comment" : "comments";
     const messageDetail = `Copilot generated ${jobInfo.noOfGeneratedComments} ${messagePart}.`;
     const summary = 'Copilot Comments';

src/dotnet/APIView/ClientSPA/src/app/app.component.ts

@@ -7,7 +7,7 @@ import { AIReviewJobCompletedDto } from './_dtos/aiReviewJobCompletedDto';
 import { UserProfile } from './_models/userProfile';
 import { SiteNotification } from './_models/notificationsModel';
 import { SignalRService } from './_services/signal-r/signal-r.service';
-import { getAIReviewNotifiationInfo } from './_helpers/common-helpers';
+import { getAIReviewNotificationInfo } from './_helpers/common-helpers';
 import { NotificationsService } from './_services/notifications/notifications.service';
 import { ThemeHelper } from './_helpers/theme.helper';
 
@@ -24,8 +24,8 @@ export class AppComponent  implements OnInit{
   userProfile: UserProfile | undefined = undefined;
 
   private destroy$ = new Subject<void>();
-  
-  constructor(private userProfileService: UserProfileService, private configService: ConfigService, 
+
+  constructor(private userProfileService: UserProfileService, private configService: ConfigService,
     private notificationsService: NotificationsService, private signalRService: SignalRService) { }
 
   ngOnInit(): void {
@@ -50,7 +50,7 @@ export class AppComponent  implements OnInit{
         }
 
         this.configService.setAppTheme(theme);
-        
+
         const body = document.body;
         if (theme !== "light-theme") {
           body.classList.remove("light-theme");
@@ -86,7 +86,7 @@ export class AppComponent  implements OnInit{
     this.signalRService.onAIReviewUpdates().pipe(takeUntil(this.destroy$)).subscribe({
       next: (aiReviewUpdate: AIReviewJobCompletedDto) => {
         if (aiReviewUpdate.createdBy == this.userProfile?.userName) {
-          const notificationInfo = getAIReviewNotifiationInfo(aiReviewUpdate, window.location.origin);
+          const notificationInfo = getAIReviewNotificationInfo(aiReviewUpdate, window.location.origin);
           if (notificationInfo) {
             this.notificationsService.addNotification(notificationInfo[0]);
           }