Code cleanup to remove warnings

PiperOrigin-RevId: 689418687
google-ai-edge · Oct 24, 2024 · 09d32f7 · 09d32f7
1 parent c2bbd1c
commit 09d32f7
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 38 deletions.
diff --git a/src/ui/src/components/visualizer/complex_queries.ts b/src/ui/src/components/visualizer/complex_queries.ts
@@ -39,7 +39,6 @@ import {
   SearchMatchType,
   SearchNodeType,
 } from './common/types';
-import {IoTree} from './io_tree';
 
 interface SearchMatchTypeOption {
   type: SearchMatchType;
@@ -57,13 +56,7 @@ interface SearchNodeTypeOption {
 @Component({
   standalone: true,
   selector: 'complex-queries',
-  imports: [
-    CommonModule,
-    IoTree,
-    MatIconModule,
-    MatMenuModule,
-    MatTooltipModule,
-  ],
+  imports: [CommonModule, MatIconModule, MatMenuModule, MatTooltipModule],
   templateUrl: './complex_queries.ng.html',
   styleUrls: ['./complex_queries.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,

diff --git a/src/ui/src/components/visualizer/info_panel.scss b/src/ui/src/components/visualizer/info_panel.scss
@@ -16,7 +16,7 @@
  * ==============================================================================
  */
 
-@import 'variables';
+@use 'variables';
 
 :host {
   position: relative;
@@ -67,7 +67,7 @@
         align-items: center;
 
         &.search-match {
-          background-color: $search-match-color;
+          background-color: variables.$search-match-color;
         }
 
         .index {
@@ -197,7 +197,7 @@
       vertical-align: text-top;
 
       &.search-match {
-        background-color: $search-match-color;
+        background-color: variables.$search-match-color;
       }
 
       &:hover.has-hover-values {
@@ -258,7 +258,7 @@
       }
 
       &.search-match {
-        background-color: $search-match-color;
+        background-color: variables.$search-match-color;
       }
     }
 
@@ -290,7 +290,7 @@
     padding: 0 12px;
 
     &.search-match {
-      background-color: $search-match-color;
+      background-color: variables.$search-match-color;
     }
 
     .label-row {

diff --git a/src/ui/src/components/visualizer/io_tree.scss b/src/ui/src/components/visualizer/io_tree.scss
@@ -16,7 +16,7 @@
  * ==============================================================================
  */
 
-@import 'variables';
+@use 'variables';
 
 .io-tree {
   background-color: transparent;
@@ -94,7 +94,7 @@
         }
 
         .node-label.search-match {
-          background-color: $search-match-color;
+          background-color: variables.$search-match-color;
         }
       }
 
@@ -116,7 +116,7 @@
           vertical-align: text-top;
 
           &.search-match {
-            background-color: $search-match-color;
+            background-color: variables.$search-match-color;
           }
 
           mat-icon.bullet {

diff --git a/src/ui/src/components/visualizer/legends_panel.scss b/src/ui/src/components/visualizer/legends_panel.scss
@@ -16,7 +16,7 @@
  * ==============================================================================
  */
 
-@import 'variables';
+@use 'variables';
 
 $block_width: 30px;
 $block_height: 14px;
@@ -54,7 +54,7 @@ $block_height: 14px;
     }
 
     .artificial-layer-key {
-      border: 1px solid $artificial-layer;
+      border: 1px solid variables.$artificial-layer;
       width: $block_width;
       height: $block_height;
       background-color: #f1f1f1;
@@ -63,7 +63,7 @@ $block_height: 14px;
     .selected-node-key {
       width: $block_width;
       height: $block_height;
-      border: 2px solid $selection-color;
+      border: 2px solid variables.$selection-color;
       border-radius: 5px;
       background-color: #c2e7ff;
     }
@@ -79,14 +79,14 @@ $block_height: 14px;
       width: $block_width;
       height: $block_height;
       border-radius: 5px;
-      border: 2px solid $incoming-edge-color;
+      border: 2px solid variables.$incoming-edge-color;
     }
 
     .output-key {
       width: $block_width;
       height: $block_height;
       border-radius: 5px;
-      border: 2px solid $outgoing-edge-color;
+      border: 2px solid variables.$outgoing-edge-color;
     }
 
     .shortcut {

diff --git a/src/ui/src/components/visualizer/node_data_provider_summary_panel.scss b/src/ui/src/components/visualizer/node_data_provider_summary_panel.scss
@@ -16,7 +16,7 @@
  * ==============================================================================
  */
 
-@import 'variables';
+@use 'variables';
 
 .container {
   padding-top: 12px;
@@ -305,12 +305,12 @@
     }
 
     td.input {
-      color: $incoming-edge-color;
+      color: variables.$incoming-edge-color;
       font-weight: 500;
     }
 
     td.output {
-      color: $outgoing-edge-color;
+      color: variables.$outgoing-edge-color;
       font-weight: 500;
     }
   }

diff --git a/src/ui/src/components/visualizer/paginator.ts b/src/ui/src/components/visualizer/paginator.ts
@@ -28,15 +28,13 @@ import {
 
 import {MatIconModule} from '@angular/material/icon';
 
-import {IoTree} from './io_tree';
-
 /**
  * A paginator for navigating through pages.
  */
 @Component({
   standalone: true,
   selector: 'paginator',
-  imports: [CommonModule, IoTree, MatIconModule],
+  imports: [CommonModule, MatIconModule],
   templateUrl: './paginator.ng.html',
   styleUrls: ['./paginator.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,

diff --git a/src/ui/src/components/visualizer/renderer_wrapper.ts b/src/ui/src/components/visualizer/renderer_wrapper.ts
@@ -34,10 +34,7 @@ import {MatButtonModule} from '@angular/material/button';
 import {MatIconModule} from '@angular/material/icon';
 import {MatMenuModule} from '@angular/material/menu';
 import {MatTooltipModule} from '@angular/material/tooltip';
-
 import {Bubble} from '../bubble/bubble';
-import {BubbleClick} from '../bubble/bubble_click';
-
 import {AppService} from './app_service';
 import {type ModelGraph} from './common/model_graph';
 import {
@@ -59,7 +56,6 @@ import {WebglRenderer} from './webgl_renderer';
   selector: 'renderer-wrapper',
   imports: [
     Bubble,
-    BubbleClick,
     CommonModule,
     EdgeOverlaysDropdown,
     MatButtonModule,

diff --git a/src/ui/src/components/visualizer/split_panes_container.ts b/src/ui/src/components/visualizer/split_panes_container.ts
@@ -38,9 +38,7 @@ import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
 import {MatTooltipModule} from '@angular/material/tooltip';
 import {combineLatest, fromEvent} from 'rxjs';
 import {takeUntil} from 'rxjs/operators';
-
 import {Bubble} from '../bubble/bubble';
-
 import {AppService} from './app_service';
 import {Pane} from './common/types';
 import {
@@ -49,8 +47,6 @@ import {
   WorkerEvent,
   WorkerEventType,
 } from './common/worker_events';
-import {GraphPanel} from './graph_panel';
-import {InfoPanel} from './info_panel';
 import {SplitPane} from './split_pane';
 import {SyncNavigationButton} from './sync_navigation_button';
 import {SyncNavigationService} from './sync_navigation_service';
@@ -69,8 +65,6 @@ interface ProcessingTask {
   imports: [
     Bubble,
     CommonModule,
-    GraphPanel,
-    InfoPanel,
     MatIconModule,
     MatProgressSpinnerModule,
     MatTooltipModule,

diff --git a/src/ui/src/components/visualizer/webgl_renderer.ts b/src/ui/src/components/visualizer/webgl_renderer.ts
@@ -194,7 +194,6 @@ type RenderElement = RenderElementNode | RenderElementEdge;
     MatIconModule,
     MatMenuModule,
     MatTooltipModule,
-    IoTree,
   ],
   providers: [
     WebglRendererAttrsTableService,
@@ -886,6 +885,20 @@ export class WebglRenderer implements OnInit, OnDestroy {
           );
           deepestExpandedGroupNodeIds = groupNodeIds;
         }
+        // Add the parent node of the selected node if it is not set in
+        // deepestExpandedGroupNodeIds.
+        else {
+          const selectedNode =
+            this.curModelGraph.nodesById[paneState.selectedNodeId];
+          const nsParentId = selectedNode?.nsParentId || '';
+          if (
+            selectedNode &&
+            nsParentId &&
+            !deepestExpandedGroupNodeIds.includes(nsParentId)
+          ) {
+            deepestExpandedGroupNodeIds.push(nsParentId);
+          }
+        }
         if (
           paneState.selectedNodeId !== '' ||
           deepestExpandedGroupNodeIds.length > 0