Embedded Single Card: fix modules for scalar card line chart (#6490)

Resolves build errors in the previous scalar card line chart changes.

Author: bhuang1323

tensorboard/webapp/metrics/views/card_renderer/BUILD

@@ -316,17 +316,16 @@ tf_ng_module(
     srcs = [
         "scalar_card_component.ts",
         "scalar_card_container.ts",
-        "scalar_card_fob_controller.ts",
         "scalar_card_module.ts",
     ],
     assets = [
         ":scalar_card_styles",
-        ":scalar_card_fob_controller_styles",
         "scalar_card_component.ng.html",
     ],
     deps = [
         ":data_download_dialog",
         ":scalar_card_data_table",
+        ":scalar_card_line_chart",
         ":scalar_card_types",
         ":utils",
         ":vis_linked_time_selection_warning",
@@ -384,16 +383,17 @@ tf_sass_binary(
 tf_ng_module(
     name = "scalar_card_line_chart",
     srcs = [
+        "scalar_card_fob_controller.ts",
         "scalar_card_line_chart_component.ts",
         "scalar_card_line_chart_container.ts",
         "scalar_card_line_chart_module.ts",
     ],
     assets = [
         ":scalar_card_line_chart_styles",
+        ":scalar_card_fob_controller_styles",
         "scalar_card_line_chart_component.ng.html",
     ],
     deps = [
-        ":scalar_card",
         ":scalar_card_types",
         ":utils",
         "//tensorboard/webapp:app_state",

tensorboard/webapp/metrics/views/card_renderer/scalar_card_line_chart_module.ts

@@ -14,14 +14,20 @@ limitations under the License.
 ==============================================================================*/
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
+import {CardFobModule} from '../../../widgets/card_fob/card_fob_module';
 import {LineChartModule as LineChartV2Module} from '../../../widgets/line_chart_v2/line_chart_module';
 import {ScalarCardLineChartComponent} from './scalar_card_line_chart_component';
 import {ScalarCardLineChartContainer} from './scalar_card_line_chart_container';
-import {ScalarCardModule} from './scalar_card_module';
+import {ScalarCardFobController} from './scalar_card_fob_controller';
 
 @NgModule({
-  declarations: [ScalarCardLineChartContainer, ScalarCardLineChartComponent],
-  exports: [ScalarCardLineChartContainer],
-  imports: [CommonModule, LineChartV2Module, ScalarCardModule],
+  declarations: [
+    ScalarCardLineChartContainer,
+    ScalarCardLineChartComponent,
+    ScalarCardFobController,
+  ],
+  // TO-DO(@brendahuang b/288573332): Remove ScalarCardFobController from exports when replacing line chart with ScalarCardLineChart for ScalarCard
+  exports: [ScalarCardLineChartContainer, ScalarCardFobController],
+  imports: [CardFobModule, CommonModule, LineChartV2Module],
 })
 export class ScalarCardLineChartModule {}

tensorboard/webapp/metrics/views/card_renderer/scalar_card_line_chart_test.ts

@@ -391,7 +391,7 @@ describe('scalar card line chart', () => {
     );
     const lineChartComponent = fixture.debugElement.query(Selector.LINE_CHART);
 
-    // HACK: we are using viewChild in ScalarCardComponent and there is
+    // HACK: we are using viewChild in ScalarCardLineChartComponent and there is
     // no good way to provide a stub implementation. Manually set what
     // would be populated by ViewChild decorator.
     scalarCardLineChartComponent.componentInstance.lineChart =

tensorboard/webapp/metrics/views/card_renderer/scalar_card_module.ts

@@ -18,7 +18,6 @@ import {MatLegacyButtonModule} from '@angular/material/legacy-button';
 import {MatIconModule} from '@angular/material/icon';
 import {MatLegacyMenuModule} from '@angular/material/legacy-menu';
 import {MatLegacyProgressSpinnerModule} from '@angular/material/legacy-progress-spinner';
-import {CardFobModule} from '../../../widgets/card_fob/card_fob_module';
 import {ExperimentAliasModule} from '../../../widgets/experiment_alias/experiment_alias_module';
 import {IntersectionObserverModule} from '../../../widgets/intersection_observer/intersection_observer_module';
 import {LineChartModule as LineChartV2Module} from '../../../widgets/line_chart_v2/line_chart_module';
@@ -28,18 +27,13 @@ import {DataDownloadModule} from './data_download_module';
 import {ScalarCardComponent} from './scalar_card_component';
 import {ScalarCardContainer} from './scalar_card_container';
 import {ScalarCardDataTableModule} from './scalar_card_data_table_module';
-import {ScalarCardFobController} from './scalar_card_fob_controller';
+import {ScalarCardLineChartModule} from './scalar_card_line_chart_module';
 import {VisLinkedTimeSelectionWarningModule} from './vis_linked_time_selection_warning_module';
 
 @NgModule({
-  declarations: [
-    ScalarCardContainer,
-    ScalarCardComponent,
-    ScalarCardFobController,
-  ],
+  declarations: [ScalarCardContainer, ScalarCardComponent],
   exports: [ScalarCardContainer],
   imports: [
-    CardFobModule,
     CommonModule,
     DataDownloadModule,
     ExperimentAliasModule,
@@ -51,6 +45,7 @@ import {VisLinkedTimeSelectionWarningModule} from './vis_linked_time_selection_w
     MatLegacyProgressSpinnerModule,
     ResizeDetectorModule,
     ScalarCardDataTableModule,
+    ScalarCardLineChartModule,
     TruncatedPathModule,
     VisLinkedTimeSelectionWarningModule,
   ],