ADK changes

PiperOrigin-RevId: 843140933

Author: hoonji

src/app/components/view-image-dialog/view-image-dialog.component.spec.ts

@@ -19,7 +19,8 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {MAT_DIALOG_DATA, MatDialogModule, MatDialogRef} from '@angular/material/dialog';
 import {By} from '@angular/platform-browser';
 
-
+import {SAFE_VALUES_SERVICE} from '../../core/services/interfaces/safevalues';
+import {MockSafeValuesService} from '../../core/services/testing/mock-safevalues.service';
 import {ViewImageDialogComponent, ViewImageDialogData} from './view-image-dialog.component';
 
 describe('ViewImageDialogComponent', () => {
@@ -28,23 +29,30 @@ describe('ViewImageDialogComponent', () => {
   let mockDialogRef: MatDialogRef<ViewImageDialogComponent>;
   let mockDialogData: ViewImageDialogData;
 
+  let mockSafeValuesService: MockSafeValuesService;
+
   beforeEach(async () => {
     mockDialogRef = jasmine.createSpyObj('MatDialogRef', ['close']);
     mockDialogData = {imageData: null};
 
     await TestBed.configureTestingModule({
-      imports: [MatDialogModule, ViewImageDialogComponent],
+      imports: [
+        MatDialogModule, ViewImageDialogComponent
+      ],
       providers: [
         {provide: MatDialogRef, useValue: mockDialogRef},
         {provide: MAT_DIALOG_DATA, useValue: mockDialogData},
+        {provide: SAFE_VALUES_SERVICE, useClass: MockSafeValuesService},
       ],
     }).compileComponents();
   });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ViewImageDialogComponent);
     component = fixture.componentInstance;
-    fixture.detectChanges();  // Initial change detection
+    mockSafeValuesService =
+        TestBed.inject(SAFE_VALUES_SERVICE) as MockSafeValuesService;
+    fixture.detectChanges();    // Initial change detection
   });
 
   it('should create', () => {
@@ -56,14 +64,19 @@ describe('ViewImageDialogComponent', () => {
     const base64Image =
         'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
     mockDialogData.imageData = base64Image;
-    component.ngOnInit();  // Manually call ngOnInit as it's not triggered by
-                           // fixture.detectChanges for @Input changes
+    mockSafeValuesService.bypassSecurityTrustUrl.and.returnValue(
+        'data:image/png;base64,' + base64Image);
+
+    component.ngOnInit();    // Manually call ngOnInit as it's not triggered by
+                             // fixture.detectChanges for @Input changes
     fixture.detectChanges();
 
     const imgElement = fixture.debugElement.query(By.css('.image-wrapper img'));
     expect(imgElement).not.toBeNull();
-    expect(imgElement.nativeElement.src)
-        .toContain('data:image/png;base64,' + base64Image);
+    expect(mockSafeValuesService.bypassSecurityTrustUrl)
+        .toHaveBeenCalledWith('data:image/png;base64,' + base64Image);
+    expect(imgElement.nativeElement.src).toEqual(
+        'data:image/png;base64,' + base64Image);
     expect(component.isSvgContent).toBeFalse();
   });
 

src/app/components/view-image-dialog/view-image-dialog.component.ts

@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-
-import {Component, Inject, OnInit} from '@angular/core';
+import {SAFE_VALUES_SERVICE} from '../../core/services/interfaces/safevalues';
+import {Component, inject, OnInit} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
-import {DomSanitizer, SafeHtml, SafeUrl} from '@angular/platform-browser';
+import {SafeHtml, SafeUrl} from '@angular/platform-browser';
 
 export interface ViewImageDialogData {
   imageData: string|null;
@@ -35,10 +35,9 @@ export class ViewImageDialogComponent implements OnInit {
   // Flag to determine if the content is SVG
   isSvgContent: boolean = false;
 
-  constructor(
-      public dialogRef: MatDialogRef<ViewImageDialogComponent>,
-      @Inject(MAT_DIALOG_DATA) public data: ViewImageDialogData,
-      private sanitizer: DomSanitizer) {}
+  readonly dialogRef = inject(MatDialogRef<ViewImageDialogComponent>);
+  readonly data = inject<ViewImageDialogData>(MAT_DIALOG_DATA);
+  private readonly safeValuesService = inject(SAFE_VALUES_SERVICE);
 
   /**
    * Lifecycle hook to initialize the component.
@@ -64,15 +63,15 @@ export class ViewImageDialogComponent implements OnInit {
     // Check if the data looks like SVG
     if (imageData.trim().includes('<svg')) {
       this.isSvgContent = true;
-      this.displayContent = this.sanitizer.bypassSecurityTrustHtml(imageData);
+      this.displayContent = this.safeValuesService.bypassSecurityTrustHtml(imageData);
     } else {
       // Assume it's base64 data if not SVG.
       // Ensure it has the correct data URI prefix.
       const prefix =
           imageData.startsWith('data:image/') ? '' : 'data:image/png;base64,';
       this.isSvgContent = false;
       this.displayContent =
-          this.sanitizer.bypassSecurityTrustUrl(prefix + imageData);
+          this.safeValuesService.bypassSecurityTrustUrl(prefix + imageData);
     }
   }
 
@@ -82,4 +81,4 @@ export class ViewImageDialogComponent implements OnInit {
   close(): void {
     this.dialogRef.close();
   }
-}
+}

src/app/core/services/interfaces/safevalues.ts

@@ -16,8 +16,7 @@
  */
 
 import {InjectionToken} from '@angular/core';
-import {SafeHtml} from '@angular/platform-browser';
-// 1p-ONLY-IMPORT
+import {SafeHtml, SafeUrl} from '@angular/platform-browser';
 
 export const SAFE_VALUES_SERVICE = new InjectionToken<SafeValuesService>(
   'SafeValuesService',
@@ -37,6 +36,7 @@ declare interface SafeValuesServiceInterface {
   openBlobUrl(blob: Blob): Window | null;
   setAnchorHref(a: HTMLAnchorElement, url: string): void;
   bypassSecurityTrustHtml(value: string): SafeHtml;
+  bypassSecurityTrustUrl(url: string): SafeUrl;
   openBase64InNewTab(dataUrl: string, mimeType: string): void;
 }
 
@@ -58,6 +58,8 @@ export abstract class SafeValuesService implements SafeValuesServiceInterface {
 
   abstract bypassSecurityTrustHtml(value: string): SafeHtml;
 
+  abstract bypassSecurityTrustUrl(url: string): SafeUrl;
+
   openBase64InNewTab(dataUrl: string, mimeType: string) {
     try {
       if (!dataUrl) {

src/app/core/services/safevalues.service.ts

@@ -16,7 +16,7 @@
  */
 
 import {inject, Injectable} from '@angular/core';
-import {DomSanitizer, SafeHtml} from '@angular/platform-browser';
+import {DomSanitizer, SafeHtml, SafeUrl} from '@angular/platform-browser';
 
 import {SafeValuesService} from './interfaces/safevalues';
 
@@ -54,4 +54,8 @@ export class SafeValuesServiceImpl extends SafeValuesService {
   bypassSecurityTrustHtml(content: string): SafeHtml {
     return this.sanitizer.bypassSecurityTrustHtml(content);
   }
+
+  bypassSecurityTrustUrl(url: string): SafeUrl {
+    return this.sanitizer.bypassSecurityTrustUrl(url);
+  }
 }

src/app/core/services/testing/mock-safevalues.service.ts

@@ -20,11 +20,12 @@ import {SafeValuesService} from '../interfaces/safevalues';
 
 /** Mock implementation of SafeValuesService. */
 @Injectable()
-export class MockSafeValuesService implements Partial<SafeValuesService> {
+export class MockSafeValuesService implements SafeValuesService {
   windowOpen = jasmine.createSpy('windowOpen');
   createObjectUrl = jasmine.createSpy('createObjectUrl');
   openBlobUrl = jasmine.createSpy('openBlobUrl');
   setAnchorHref = jasmine.createSpy('setAnchorHref');
   openBase64InNewTab = jasmine.createSpy('openBase64InNewTab');
   bypassSecurityTrustHtml = jasmine.createSpy('bypassSecurityTrustHtml');
+  bypassSecurityTrustUrl = jasmine.createSpy('bypassSecurityTrustUrl');
 }