More changes required for rust apiview

Azure · Mar 3, 2025 · 2a5fe5d · 2a5fe5d
1 parent 1793d67
commit 2a5fe5d
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 7 deletions.
diff --git a/src/dotnet/APIView/APIViewWeb/Client/css/shared/language-customizations.scss b/src/dotnet/APIView/APIViewWeb/Client/css/shared/language-customizations.scss
@@ -234,6 +234,11 @@
     background: url(/icons/typespec-original.svg) center center no-repeat;
 }
 
+.icon-rust {
+    @extend .icon-language;
+    background: var(--rust-icon)
+}
+
 .icon-comments {
     cursor: pointer;
     position: absolute;

diff --git a/src/dotnet/APIView/APIViewWeb/Client/css/shared/theme-colors.scss b/src/dotnet/APIView/APIViewWeb/Client/css/shared/theme-colors.scss
@@ -60,6 +60,7 @@
     --java-anotation-name-color: #9E880D;
     --java-string-literal-color: #067D17;
     --java-number-color: #1750EB;
+    --rust-icon: url(/icons/rust-original.svg) center center no-repeat;
     --alert-success-color: #0a3622;
     --alert-success-bg: #d1e7dd;
     --alert-success-border-color: #a3cfbb;
@@ -151,6 +152,7 @@
     --java-anotation-name-color: #BBB529;
     --java-string-literal-color: #6A8759;
     --java-number-color: #6897BB;
+    --rust-icon: url(/icons/rust-light-original.svg) center center no-repeat;
     --alert-success-color: #75b798;
     --alert-success-bg: #051b11;
     --alert-success-border-color: #0f5132;
@@ -244,6 +246,7 @@
     --java-anotation-name-color: #BBB529;
     --java-string-literal-color: #6A8759;
     --java-number-color: #6897BB;
+    --rust-icon: url(/icons/rust-light-original.svg) center center no-repeat;
     --alert-success-color: #75b798;
     --alert-success-bg: #051b11;
     --alert-success-border-color: #0f5132;

diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/rust-light-original.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/rust-light-original.svg
diff --git a/src/dotnet/APIView/APIViewWeb/wwwroot/icons/rust-original.svg b/src/dotnet/APIView/APIViewWeb/wwwroot/icons/rust-original.svg
diff --git a/src/dotnet/APIView/ClientSPA/src/app/_components/index-page/index-page.component.html b/src/dotnet/APIView/ClientSPA/src/app/_components/index-page/index-page.component.html
@@ -5,7 +5,7 @@
         [style]="{ height: 'calc(100vh - 80px)', border: '0px' }">
         <ng-template pTemplate>
             <div class="col flex align-items-center justify-content-center border rounded-start overflow-hidden">
-                <app-reviews-list (reviewEmitter)="getRevisions($event)"></app-reviews-list>
+                <app-reviews-list [userProfile]="userProfile" (reviewEmitter)="getRevisions($event)"></app-reviews-list>
             </div>
         </ng-template>
         <ng-template pTemplate>

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
@@ -47,7 +47,7 @@
                         <p-multiSelect [ngModel]="value" [appendTo]="reviewsTable" [options]="languages" [filter]="false" [(ngModel)]="selectedLanguages" (onChange)="filter($event.value)" optionLabel="label">
                             <ng-template let-option pTemplate="item">
                                 <div class="inline-block vertical-align-middle">
-                                    <img [alt]="" src="{{assetsPath}}/images/{{ option.label | languageNames }}-original.svg" width="24" class="vertical-align-middle" />
+                                    <img [alt]="" src="{{assetsPath}}/images/{{ option.label | languageNames: userProfile?.preferences?.theme }}-original.svg" width="24" class="vertical-align-middle" />
                                     <span class="mx-2 mt-1">{{ option.label }}</span>
                                 </div>
                             </ng-template>
@@ -63,7 +63,7 @@
     <ng-template pTemplate="body" let-review>
         <tr [pContextMenuRow]="review" [pSelectableRow]="review">
             <td>
-                <img class="ms-3" src="{{assetsPath}}/images/{{ review.language | languageNames }}-original.svg" alt="{{review.language}}" width="25">
+                <img class="ms-3" src="{{assetsPath}}/images/{{ review.language | languageNames: userProfile?.preferences?.theme }}-original.svg" alt="{{review.language}}" width="25">
             </td>
             <td style="word-wrap: break-word; max-width: 10ch">{{ review.packageName }} <i *ngIf="review.isApproved" class="fas fa-check-circle text-success"></i></td>
         </tr>

diff --git a/src/dotnet/APIView/ClientSPA/src/app/_components/reviews-list/reviews-list.component.ts b/src/dotnet/APIView/ClientSPA/src/app/_components/reviews-list/reviews-list.component.ts
@@ -1,4 +1,4 @@
-import { Component, ElementRef, EventEmitter, OnInit, AfterViewInit, Output, ViewChild, ChangeDetectorRef } from '@angular/core';
+import { Component, ElementRef, EventEmitter, OnInit, AfterViewInit, Output, ViewChild, ChangeDetectorRef, Input } from '@angular/core';
 
 import { FirstReleaseApproval, Review, SelectItemModel } from 'src/app/_models/review';
 import { ReviewsService } from 'src/app/_services/reviews/reviews.service';
@@ -7,13 +7,15 @@ import { Table, TableFilterEvent, TableLazyLoadEvent, TableRowSelectEvent } from
 import { MenuItem, SortEvent } from 'primeng/api';
 import { environment } from 'src/environments/environment';
 import { CookieService } from 'ngx-cookie-service';
+import { UserProfile } from 'src/app/_models/userProfile';
 
 @Component({
   selector: 'app-reviews-list',
   templateUrl: './reviews-list.component.html',
   styleUrls: ['./reviews-list.component.scss']
 })
 export class ReviewsListComponent implements OnInit, AfterViewInit {
+  @Input() userProfile: UserProfile | undefined;
   @Output() reviewEmitter : EventEmitter<Review> = new EventEmitter<Review>();
   @ViewChild("reviewsTable") reviewsTable!: Table;
   @ViewChild("firstReleaseApprovalAllCheck") firstReleaseApprovalAllCheck!: ElementRef<HTMLInputElement>;
@@ -136,6 +138,7 @@ export class ReviewsListComponent implements OnInit, AfterViewInit {
         { label: "Json", data: "Json" },
         { label: "Kotlin", data: "Kotlin" },
         { label: "Python", data: "Python" },
+        { label: "Rust", data: "Rust" },
         { label: "Swagger", data: "Swagger" },
         { label: "Swift", data: "Swift" },
         { label: "TypeSpec", data: "TypeSpec" },