071824.03/revision links (#8663)

* Handle Opening on Revision Pages * Handle Revision SideBar Closing
Azure · Jul 22, 2024 · c9cad29 · c9cad29
1 parent 8db91de
commit c9cad29
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 13 deletions.
diff --git a/src/dotnet/APIView/ClientSPA/src/app/_components/review-page/review-page.component.html b/src/dotnet/APIView/ClientSPA/src/app/_components/review-page/review-page.component.html
@@ -66,7 +66,9 @@
         </div>
     </div>
 </div>
-<p-sidebar [(visible)]="revisionSidePanel!" position="right" [modal]="true" styleClass="revisions-sidebar">
-    <app-revisions-list [review]="review"></app-revisions-list>
+<p-sidebar [(visible)]="revisionSideBarVisible" position="right" [modal]="true" styleClass="revisions-sidebar">
+    <app-revisions-list 
+        [review]="review"
+        [revisionSideBarVisible]="revisionSideBarVisible"></app-revisions-list>
 </p-sidebar>
 <app-footer></app-footer>
diff --git a/src/dotnet/APIView/ClientSPA/src/app/_components/review-page/review-page.component.ts b/src/dotnet/APIView/ClientSPA/src/app/_components/review-page/review-page.component.ts
@@ -33,7 +33,7 @@ export class ReviewPageComponent implements OnInit {
   apiRevisions: APIRevision[] = [];
   activeAPIRevision : APIRevision | undefined = undefined;
   diffAPIRevision : APIRevision | undefined = undefined;
-  revisionSidePanel : boolean | undefined = undefined;
+  revisionSideBarVisible : boolean  = false;
   reviewPageNavigation : TreeNode[] = [];
   language: string | undefined;
   languageSafeName: string | undefined;
@@ -103,7 +103,7 @@ export class ReviewPageComponent implements OnInit {
     this.sideMenu = [
       {
           icon: 'bi bi-clock-history',
-          command: () => { this.revisionSidePanel = !this.revisionSidePanel; }
+          command: () => { this.revisionSideBarVisible = !this.revisionSideBarVisible; }
       }
     ];
   }
@@ -408,7 +408,7 @@ export class ReviewPageComponent implements OnInit {
         break;
       }
     }
-  }
+  } 
 
   ngOnDestroy() {
     this.workerService.terminateWorker();

diff --git a/src/dotnet/APIView/ClientSPA/src/app/_components/revisions-list/revisions-list.component.ts b/src/dotnet/APIView/ClientSPA/src/app/_components/revisions-list/revisions-list.component.ts
@@ -21,6 +21,7 @@ import { environment } from 'src/environments/environment';
 })
 export class RevisionsListComponent implements OnInit, OnChanges {
   @Input() review : Review | undefined = undefined;
+  @Input() revisionSideBarVisible : boolean = false;
 
   @ViewChild("revisionCreationFileUpload") revisionCreationFileUpload!: FileUpload;
 
@@ -107,6 +108,11 @@ export class RevisionsListComponent implements OnInit, OnChanges {
       this.showSelectionActions = false;
       this.showDiffButton = false;
     }
+
+    if (changes['revisionSideBarVisible'] && changes['revisionSideBarVisible'].currentValue == false) {
+      this.createRevisionSidebarVisible = false;
+      this.optionsSidebarVisible = false;
+    }
   }
 
   /**
@@ -231,14 +237,14 @@ export class RevisionsListComponent implements OnInit, OnChanges {
   viewDiffOfSelectedAPIRevisions() {
     if (this.selectedRevisions.length == 2)
     {
-      this.apiRevisionsService.openDiffOfAPIRevisions(this.review!.id, this.selectedRevisions[0].id, this.selectedRevisions[1].id, this.router.url);
+      this.apiRevisionsService.openDiffOfAPIRevisions(this.selectedRevisions[0], this.selectedRevisions[1], this.router.url);
     }
   }
 
   viewRevision(apiRevision: APIRevision) {
     if (!this.showDeletedAPIRevisions)
     {
-      this.apiRevisionsService.openAPIRevisionPage(apiRevision.reviewId, apiRevision.id, this.router.url);
+      this.apiRevisionsService.openAPIRevisionPage(apiRevision, this.router.url);
     }
   }
 
@@ -471,7 +477,7 @@ export class RevisionsListComponent implements OnInit, OnChanges {
             this.createRevisionSidebarVisible = false;
             this.creatingRevision = false;
             this.crButtonText = "Create Review";
-            this.apiRevisionsService.openAPIRevisionPage(response.reviewId, response.id, this.router.url);
+            this.apiRevisionsService.openAPIRevisionPage(response, this.router.url);
           }
         },
         error: (error: any) => {

diff --git a/src/dotnet/APIView/ClientSPA/src/app/_models/revision.ts b/src/dotnet/APIView/ClientSPA/src/app/_models/revision.ts
@@ -15,9 +15,30 @@ export enum CodePanelRowDatatype {
   CommentThread = "commentThread"
 }
 
+export enum ParserStyle {
+  Flat = "Flat",
+  Tree = "Tree"
+}
+
+export interface APICodeFileModel {
+  fileId: string;
+  name: string;
+  versionString: string;
+  parserStyle: string;
+  languageVariant: string;
+  hasOriginal: boolean;
+  creationDate: Date;
+  runAnalysis: boolean;
+  packageName: string;
+  fileName: string;
+  packageVersion: string;
+  crossLanguagePackageId: string;
+}
+
 export interface APIRevision {
   id: string
   reviewId: string
+  files: APICodeFileModel[];
   packageName: string
   language: string
   apiRevisionType: string

diff --git a/src/dotnet/APIView/ClientSPA/src/app/_services/revisions/revisions.service.ts b/src/dotnet/APIView/ClientSPA/src/app/_services/revisions/revisions.service.ts
@@ -4,7 +4,7 @@ import { Observable, map } from 'rxjs';
 
 
 import { PaginatedResult } from 'src/app/_models/pagination';
-import { APIRevision } from 'src/app/_models/revision';
+import { APIRevision, ParserStyle } from 'src/app/_models/revision';
 import { ConfigService } from '../config/config.service';
 
 
@@ -126,14 +126,24 @@ export class RevisionsService {
     });
   }
 
-  openDiffOfAPIRevisions(reviewId: string, activeAPIRevisionId: string, diffAPIRevisionsId: string, currentRoute: string) {
+  openDiffOfAPIRevisions(activeAPIRevision: APIRevision, diffAPIRevision: APIRevision, currentRoute: string) {
     const target = (currentRoute.includes("review")) ? '_self' : '_blank';
-    window.open(this.configService.webAppUrl + `Assemblies/Review/${reviewId}?revisionId=${activeAPIRevisionId}&diffOnly=False&doc=False&diffRevisionId=${diffAPIRevisionsId}`, target);
+
+    if (activeAPIRevision.files[0].parserStyle === "tree") {
+      window.open(`/review/${activeAPIRevision.reviewId}?activeApiRevisionId=${activeAPIRevision.id}&diffApiRevisionId=${diffAPIRevision.id}`, target);
+    } else {
+      window.open(this.configService.webAppUrl + `Assemblies/Review/${activeAPIRevision.reviewId}?revisionId=${activeAPIRevision.id}&diffOnly=False&doc=False&diffRevisionId=${diffAPIRevision.id}`, target);
+    }
   }
 
-  openAPIRevisionPage(reviewId: string, activeAPIRevisionId: string, currentRoute: string) {
+  openAPIRevisionPage(apiRevision: APIRevision, currentRoute: string) {
     const target = (currentRoute.includes("review")) ? '_self' : '_blank';
-    window.open(this.configService.webAppUrl + `Assemblies/Review/${reviewId}?revisionId=${activeAPIRevisionId}`, target);
+
+    if (apiRevision.files[0].parserStyle === "tree") {
+      window.open(`/review/${apiRevision.reviewId}?activeApiRevisionId=${apiRevision.id}`, target);
+    } else {
+      window.open(this.configService.webAppUrl + `Assemblies/Review/${apiRevision.reviewId}?revisionId=${apiRevision.id}`, target);
+    }
   }
 
   updateSelectedReviewers(reviewId: string, apiRevisionId: string, reviewers: Set<string>): Observable<APIRevision> {