Add tool path durign deployment, enable code faile comparison for tree style codeFiles

chidozieononiwu · chidozieononiwu · commit 9bea8e9ee55e · 2024-06-28T11:54:41.000-07:00
diff --git a/src/dotnet/APIView/APIViewWeb/Helpers/CodeFileHelpers.cs b/src/dotnet/APIView/APIViewWeb/Helpers/CodeFileHelpers.cs
@@ -529,6 +529,7 @@ private static void BuildTokensForDiffNodes(CodePanelData codePanelData, CodePan
 
                     if (diffTokenRowResult.HasDiff)
                     {
+                        codePanelData.HasDiff = true;
                         codePanelData.NodeMetaDataObj[nodeIdHashed].IsNodeWithDiff = true;
                         var parentNodeIdHashed = codePanelData.NodeMetaDataObj[nodeIdHashed].ParentNodeIdHashed;
                         while (parentNodeIdHashed != "root" && codePanelData.NodeMetaDataObj.ContainsKey(parentNodeIdHashed))
diff --git a/src/dotnet/APIView/APIViewWeb/LeanModels/ReviewRevisionPageModels.cs b/src/dotnet/APIView/APIViewWeb/LeanModels/ReviewRevisionPageModels.cs
@@ -124,6 +124,7 @@ public class CodePanelData
         [JsonIgnore]
         public ConcurrentDictionary<string, CodePanelNodeMetaData> NodeMetaDataObj { get; set; } = new ConcurrentDictionary<string, CodePanelNodeMetaData>();
         public ConcurrentDictionary<string, CodePanelNodeMetaData> NodeMetaData => NodeMetaDataObj.Count > 0 ? NodeMetaDataObj : null;
+        public bool HasDiff { get; set; } = false;
     }
 
     public class NavigationTreeNodeData
diff --git a/src/dotnet/APIView/APIViewWeb/Managers/APIRevisionsManager.cs b/src/dotnet/APIView/APIViewWeb/Managers/APIRevisionsManager.cs
@@ -704,7 +704,7 @@ public async Task<bool> AreAPIRevisionsTheSame(APIRevisionListItemModel revision
         {
             //This will compare and check if new code file content is same as revision in parameter
             var lastRevisionFile = await _codeFileRepository.GetCodeFileAsync(revision, false);
-            return _codeFileManager.AreAPICodeFilesTheSame(codeFileA: lastRevisionFile, codeFileB: renderedCodeFile);
+            return await _codeFileManager.AreAPICodeFilesTheSame(codeFileA: lastRevisionFile, codeFileB: renderedCodeFile);
         }
 
         /// <summary>
diff --git a/src/dotnet/APIView/APIViewWeb/Managers/CodeFileManager.cs b/src/dotnet/APIView/APIViewWeb/Managers/CodeFileManager.cs
@@ -4,6 +4,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 using ApiView;
+using APIViewWeb.Helpers;
+using APIViewWeb.LeanModels;
 using APIViewWeb.Managers.Interfaces;
 using APIViewWeb.Models;
 using APIViewWeb.Repositories;
@@ -196,11 +198,25 @@ public async Task<APICodeFileModel> CreateReviewCodeFileModel(string apiRevision
         /// <param name="codeFileA"></param>
         /// <param name="codeFileB"></param>
         /// <returns></returns>
-        public bool AreAPICodeFilesTheSame(RenderedCodeFile codeFileA, RenderedCodeFile codeFileB)
+        public async Task<bool> AreAPICodeFilesTheSame(RenderedCodeFile codeFileA, RenderedCodeFile codeFileB)
         {
-            var codeFileATextLines = codeFileA.RenderText(false, skipDiff: true);
-            var codeFileBTextLines = codeFileB.RenderText(false, skipDiff: true);
-            return codeFileATextLines.SequenceEqual(codeFileBTextLines);
+            if (LanguageServiceHelpers.UsesTreeStyleParser(codeFileA.CodeFile.Language))
+            {
+                var diffTree =CodeFileHelpers.ComputeAPIForestDiff(codeFileA.CodeFile.APIForest, codeFileB.CodeFile.APIForest);
+                var codePanelRawData = new CodePanelRawData()
+                {
+                    APIForest = diffTree,
+                    Language = codeFileA.CodeFile.Language
+                };
+                var result = await CodeFileHelpers.GenerateCodePanelDataAsync(codePanelRawData);
+                return result.HasDiff;
+            }
+            else
+            {
+                var codeFileATextLines = codeFileA.RenderText(false, skipDiff: true);
+                var codeFileBTextLines = codeFileB.RenderText(false, skipDiff: true);
+                return codeFileATextLines.SequenceEqual(codeFileBTextLines);
+            }
         }
 
         public bool AreCodeFilesTheSame(CodeFile codeFileA, CodeFile codeFileB)
diff --git a/src/dotnet/APIView/APIViewWeb/Managers/Interfaces/ICodeFileManager.cs b/src/dotnet/APIView/APIViewWeb/Managers/Interfaces/ICodeFileManager.cs
@@ -12,7 +12,7 @@ public Task<CodeFile> GetCodeFileAsync(string repoName, string buildId, string a
         public Task<APICodeFileModel> CreateCodeFileAsync(string apiRevisionId, string originalName, bool runAnalysis, Stream fileStream = null, string language = null);
         public Task<CodeFile> CreateCodeFileAsync(string originalName, bool runAnalysis, MemoryStream memoryStream, Stream fileStream = null, string language = null);
         public Task<APICodeFileModel> CreateReviewCodeFileModel(string apiRevisionId, MemoryStream memoryStream, CodeFile codeFile);
-        public bool AreAPICodeFilesTheSame(RenderedCodeFile codeFileA, RenderedCodeFile codeFileB);
+        public Task<bool> AreAPICodeFilesTheSame(RenderedCodeFile codeFileA, RenderedCodeFile codeFileB);
         public bool AreCodeFilesTheSame(CodeFile codeFileA, CodeFile codeFileB);
     }
 }
diff --git a/src/dotnet/APIView/ClientSPA/src/app/_components/reviews-list/reviews-list.component.html b/src/dotnet/APIView/ClientSPA/src/app/_components/reviews-list/reviews-list.component.html
@@ -130,7 +130,6 @@ <h5 class="card-title">What to Upload</h5>
         </div>
         <div class="mt-2">
             <p-fileUpload
-                formControlName="selectedFile"
                 #reviewCreationFileUpload name="selectedFile"
                 *ngIf="createReviewForm.get('selectedCRLanguage')!.value != undefined && createReviewForm.get('selectedCRLanguage')!.value!.label != 'TypeSpec'"
                 chooseLabel="Select {{ acceptedFilesForReviewUpload }} File to Upload" [customUpload]="true"
diff --git a/src/dotnet/APIView/ClientSPA/src/app/_services/http-error-interceptor/http-error-interceptor.service.spec.ts b/src/dotnet/APIView/ClientSPA/src/app/_services/http-error-interceptor/http-error-interceptor.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { HttpErrorInterceptorService } from '../http-error-interceptor.service';
+
+describe('HttpErrorInterceptorService', () => {
+  let service: HttpErrorInterceptorService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(HttpErrorInterceptorService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/dotnet/APIView/ClientSPA/src/app/_services/http-error-interceptor/http-error-interceptor.service.ts b/src/dotnet/APIView/ClientSPA/src/app/_services/http-error-interceptor/http-error-interceptor.service.ts
@@ -0,0 +1,25 @@
+import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { catchError, Observable, throwError } from 'rxjs';
+
+@Injectable()
+export class HttpErrorInterceptorService implements HttpInterceptor{
+  intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
+    return next.handle(request)
+      .pipe(
+        catchError((error: HttpErrorResponse) => {
+          let errorMessage = 'Unknown error occurred';
+          if (error.error instanceof ErrorEvent) {
+            // Client-side error
+            errorMessage = `Client Side: ${error.error.message}`;
+          } else {
+            // Server-side error
+            errorMessage = `Server Side: ${error.status}\nMessage: ${error.message}`;
+          }
+          // Here you can add more error handling logic, like logging errors or showing a notification to the user
+          console.error(errorMessage);
+          return throwError(() => new Error(errorMessage));
+        })
+      );
+  }
+}
diff --git a/src/dotnet/APIView/ClientSPA/src/app/app.module.ts b/src/dotnet/APIView/ClientSPA/src/app/app.module.ts
@@ -1,7 +1,7 @@
 import { NgModule, APP_INITIALIZER, isDevMode } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { HttpClientModule } from '@angular/common/http';
+import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
 import { AppRoutingModule } from './app-routing.module';
@@ -27,6 +27,7 @@ import { Observable } from 'rxjs';
 import { ConfigService } from './_services/config/config.service';
 import { CookieService } from 'ngx-cookie-service';
 import { SharedAppModule } from './_modules/shared/shared-app.module';
+import { HttpErrorInterceptorService } from './_services/http-error-interceptor/http-error-interceptor.service';
 
 export function initializeApp(configService: ConfigService) {
   return (): Observable<any> => {
@@ -72,6 +73,11 @@ export function initializeApp(configService: ConfigService) {
       deps: [ConfigService],
       multi: true
     },
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: HttpErrorInterceptorService,
+      multi: true
+    },
     CookieService
   ],
   bootstrap: [AppComponent]
diff --git a/src/dotnet/APIView/apiview.yml b/src/dotnet/APIView/apiview.yml
@@ -360,6 +360,7 @@ extends:
                     call npm run-script build --prefix D:\home\site\wwwroot --force
                     echo Installing .NET tool
                     call dotnet tool install --global --add-source ${{ parameters.AzureSdkForNetDevOpsFeed }} --version  ${{ parameters.CSharpAPIParserVersion }} CSharpAPIParser
+                    call setx PATH "%PATH%;%USERPROFILE%\.dotnet\tools"
                     echo Installing Python tools
                     call D:\home\site\wwwroot\Python\python -m pip uninstall api-stub-generator
                     call D:\home\site\wwwroot\Python\python -m pip install pylint==2.13.9 pylint-guidelines-checker==0.0.6 api-stub-generator==0.3.2 --index-url "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/"

Original file line number	Diff line number	Diff line change
`@@ -529,6 +529,7 @@ private static void BuildTokensForDiffNodes(CodePanelData codePanelData, CodePan`
`529`	`529`
`530`	`530`	`if (diffTokenRowResult.HasDiff)`
`531`	`531`	`{`
	`532`	`+ codePanelData.HasDiff = true;`
`532`	`533`	`codePanelData.NodeMetaDataObj[nodeIdHashed].IsNodeWithDiff = true;`
`533`	`534`	`var parentNodeIdHashed = codePanelData.NodeMetaDataObj[nodeIdHashed].ParentNodeIdHashed;`
`534`	`535`	`while (parentNodeIdHashed != "root" && codePanelData.NodeMetaDataObj.ContainsKey(parentNodeIdHashed))`
Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@ public class CodePanelData`
`124`	`124`	`[JsonIgnore]`
`125`	`125`	`public ConcurrentDictionary<string, CodePanelNodeMetaData> NodeMetaDataObj { get; set; } = new ConcurrentDictionary<string, CodePanelNodeMetaData>();`
`126`	`126`	`public ConcurrentDictionary<string, CodePanelNodeMetaData> NodeMetaData => NodeMetaDataObj.Count > 0 ? NodeMetaDataObj : null;`
	`127`	`+ public bool HasDiff { get; set; } = false;`
`127`	`128`	`}`
`128`	`129`
`129`	`130`	`public class NavigationTreeNodeData`
Original file line number	Diff line number	Diff line change
`@@ -704,7 +704,7 @@ public async Task<bool> AreAPIRevisionsTheSame(APIRevisionListItemModel revision`
`704`	`704`	`{`
`705`	`705`	`//This will compare and check if new code file content is same as revision in parameter`
`706`	`706`	`var lastRevisionFile = await _codeFileRepository.GetCodeFileAsync(revision, false);`
`707`		`- return _codeFileManager.AreAPICodeFilesTheSame(codeFileA: lastRevisionFile, codeFileB: renderedCodeFile);`
	`707`	`+ return await _codeFileManager.AreAPICodeFilesTheSame(codeFileA: lastRevisionFile, codeFileB: renderedCodeFile);`
`708`	`708`	`}`
`709`	`709`
`710`	`710`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public Task<CodeFile> GetCodeFileAsync(string repoName, string buildId, string a`
`12`	`12`	`public Task<APICodeFileModel> CreateCodeFileAsync(string apiRevisionId, string originalName, bool runAnalysis, Stream fileStream = null, string language = null);`
`13`	`13`	`public Task<CodeFile> CreateCodeFileAsync(string originalName, bool runAnalysis, MemoryStream memoryStream, Stream fileStream = null, string language = null);`
`14`	`14`	`public Task<APICodeFileModel> CreateReviewCodeFileModel(string apiRevisionId, MemoryStream memoryStream, CodeFile codeFile);`
`15`		`- public bool AreAPICodeFilesTheSame(RenderedCodeFile codeFileA, RenderedCodeFile codeFileB);`
	`15`	`+ public Task<bool> AreAPICodeFilesTheSame(RenderedCodeFile codeFileA, RenderedCodeFile codeFileB);`
`16`	`16`	`public bool AreCodeFilesTheSame(CodeFile codeFileA, CodeFile codeFileB);`
`17`	`17`	`}`
`18`	`18`	`}`