Renames HparamsFilterbar to Filterbar

tensorflow · Dec 5, 2023 · deb02fd · deb02fd
1 parent a4bbf7f
commit deb02fd
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 31 deletions.
diff --git a/tensorboard/webapp/runs/views/runs_table/BUILD b/tensorboard/webapp/runs/views/runs_table/BUILD
@@ -22,8 +22,8 @@ tf_sass_binary(
 )
 
 tf_sass_binary(
-    name = "hparam_filterbar_styles",
-    src = "hparam_filterbar_component.scss",
+    name = "filterbar_styles",
+    src = "filterbar_component.scss",
     strict_deps = False,
     deps = ["//tensorboard/webapp/theme"],
 )
@@ -53,8 +53,8 @@ tf_ts_library(
 tf_ng_module(
     name = "runs_table",
     srcs = [
-        "hparam_filterbar_component.ts",
-        "hparam_filterbar_container.ts",
+        "filterbar_component.ts",
+        "filterbar_container.ts",
         "regex_edit_dialog_component.ts",
         "regex_edit_dialog_container.ts",
         "runs_data_table.ts",
@@ -66,10 +66,10 @@ tf_ng_module(
     ],
     assets = [
         ":regex_edit_dialog_styles",
-        ":hparam_filterbar_styles",
+        ":filterbar_styles",
         ":runs_data_table_styles",
         ":runs_group_menu_button_styles",
-        "hparam_filterbar_component.ng.html",
+        "filterbar_component.ng.html",
         "regex_edit_dialog.ng.html",
         "runs_data_table.ng.html",
         "runs_group_menu_button_component.ng.html",
@@ -130,7 +130,7 @@ tf_ts_library(
     name = "runs_table_test",
     testonly = True,
     srcs = [
-        "hparam_filterbar_test.ts",
+        "filterbar_test.ts",
         "regex_edit_dialog_test.ts",
         "runs_data_table_test.ts",
         "runs_table_test.ts",

diff --git a/..._table/hparam_filterbar_component.ng.html → ...ws/runs_table/filterbar_component.ng.html b/..._table/hparam_filterbar_component.ng.html → ...ws/runs_table/filterbar_component.ng.html
diff --git a/...uns_table/hparam_filterbar_component.scss → ...views/runs_table/filterbar_component.scss b/...uns_table/hparam_filterbar_component.scss → ...views/runs_table/filterbar_component.scss
diff --git a/.../runs_table/hparam_filterbar_component.ts → ...s/views/runs_table/filterbar_component.ts b/.../runs_table/hparam_filterbar_component.ts → ...s/views/runs_table/filterbar_component.ts
@@ -30,12 +30,12 @@ import {RangeValues} from '../../../widgets/range_input/types';
 import {CustomModalComponent} from '../../../widgets/custom_modal/custom_modal_component';
 
 @Component({
-  selector: 'hparam-filterbar-component',
-  templateUrl: 'hparam_filterbar_component.ng.html',
-  styleUrls: ['hparam_filterbar_component.css'],
+  selector: 'filterbar-component',
+  templateUrl: 'filterbar_component.ng.html',
+  styleUrls: ['filterbar_component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class HparamFilterbarComponent {
+export class FilterbarComponent {
   @Input() filters!: Map<string, DiscreteFilter | IntervalFilter>;
 
   @Output() removeHparamFilter = new EventEmitter<string>();
@@ -57,8 +57,6 @@ export class HparamFilterbarComponent {
     return this.filters.get(this.selectedFilterName);
   }
 
-  constructor() {}
-
   openFilterMenu(event: MouseEvent, filterName: string) {
     this.selectedFilterName = filterName;
     const rect = (

diff --git a/.../runs_table/hparam_filterbar_container.ts → ...s/views/runs_table/filterbar_container.ts b/.../runs_table/hparam_filterbar_container.ts → ...s/views/runs_table/filterbar_container.ts
@@ -23,17 +23,17 @@ import {
 import {FilterAddedEvent} from '../../../widgets/data_table/types';
 
 @Component({
-  selector: 'hparam-filterbar',
-  template: `<hparam-filterbar-component
+  selector: 'filterbar',
+  template: `<filterbar-component
     [filters]="filters$ | async"
     (removeHparamFilter)="removeHparamFilter($event)"
     (addFilter)="addHparamFilter($event)"
   >
-  </hparam-filterbar-component>`,
+  </filterbar-component>`,
   styles: [``],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class HparamFilterbarContainer implements OnDestroy {
+export class FilterbarContainer implements OnDestroy {
   filters$ = this.store.select(hparamsSelectors.getDashboardHparamFilterMap);
 
   private readonly ngUnsubscribe = new Subject<void>();

diff --git a/...views/runs_table/hparam_filterbar_test.ts → ...p/runs/views/runs_table/filterbar_test.ts b/...views/runs_table/hparam_filterbar_test.ts → ...p/runs/views/runs_table/filterbar_test.ts
@@ -14,8 +14,8 @@ limitations under the License.
 ==============================================================================*/
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {NO_ERRORS_SCHEMA} from '@angular/core';
-import {HparamFilterbarComponent} from './hparam_filterbar_component';
-import {HparamFilterbarContainer} from './hparam_filterbar_container';
+import {FilterbarComponent} from './filterbar_component';
+import {FilterbarContainer} from './filterbar_container';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {provideMockTbStore} from '../../../testing/utils';
 import {MockStore} from '@ngrx/store/testing';
@@ -75,7 +75,7 @@ describe('hparam_filterbar', () => {
         MatIconTestingModule,
         FilterDialogModule,
       ],
-      declarations: [HparamFilterbarComponent, HparamFilterbarContainer],
+      declarations: [FilterbarComponent, FilterbarContainer],
       providers: [provideMockTbStore()],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
@@ -85,23 +85,21 @@ describe('hparam_filterbar', () => {
     store?.resetSelectors();
   });
 
-  function createComponent(): ComponentFixture<HparamFilterbarContainer> {
+  function createComponent(): ComponentFixture<FilterbarContainer> {
     store = TestBed.inject<Store<State>>(Store) as MockStore<State>;
     actualActions = [];
     dispatchSpy = spyOn(store, 'dispatch').and.callFake((action: Action) => {
       actualActions.push(action);
     });
 
-    return TestBed.createComponent(HparamFilterbarContainer);
+    return TestBed.createComponent(FilterbarContainer);
   }
 
   it('renders hparam filterbar', () => {
     const fixture = createComponent();
     fixture.detectChanges();
 
-    const dialog = fixture.debugElement.query(
-      By.directive(HparamFilterbarComponent)
-    );
+    const dialog = fixture.debugElement.query(By.directive(FilterbarComponent));
 
     expect(dialog).toBeTruthy();
   });
@@ -164,7 +162,7 @@ describe('hparam_filterbar', () => {
       fakeFilterMap
     );
     const component = fixture.debugElement.query(
-      By.directive(HparamFilterbarComponent)
+      By.directive(FilterbarComponent)
     ).componentInstance;
     const openAtPositionSpy = spyOn(
       CustomModalComponent.prototype,

diff --git a/tensorboard/webapp/runs/views/runs_table/runs_data_table.ng.html b/tensorboard/webapp/runs/views/runs_table/runs_data_table.ng.html
@@ -23,7 +23,7 @@
     placeholder="Filter runs (regex)"
   ></tb-filter-input>
 </div>
-<hparam-filterbar></hparam-filterbar>
+<filterbar></filterbar>
 <div class="table-container">
   <tb-data-table
     [headers]="headers"

diff --git a/tensorboard/webapp/runs/views/runs_table/runs_table_module.ts b/tensorboard/webapp/runs/views/runs_table/runs_table_module.ts
@@ -39,8 +39,8 @@ import {FilterDialogModule} from '../../../widgets/data_table/filter_dialog_modu
 import {RangeInputModule} from '../../../widgets/range_input/range_input_module';
 import {RegexEditDialogComponent} from './regex_edit_dialog_component';
 import {RegexEditDialogContainer} from './regex_edit_dialog_container';
-import {HparamFilterbarComponent} from './hparam_filterbar_component';
-import {HparamFilterbarContainer} from './hparam_filterbar_container';
+import {FilterbarComponent} from './filterbar_component';
+import {FilterbarContainer} from './filterbar_container';
 import {RunsGroupMenuButtonComponent} from './runs_group_menu_button_component';
 import {RunsGroupMenuButtonContainer} from './runs_group_menu_button_container';
 import {CustomModalModule} from '../../../widgets/custom_modal/custom_modal_module';
@@ -75,8 +75,8 @@ import {RunsTableContainer} from './runs_table_container';
   declarations: [
     RegexEditDialogComponent,
     RegexEditDialogContainer,
-    HparamFilterbarComponent,
-    HparamFilterbarContainer,
+    FilterbarComponent,
+    FilterbarContainer,
     RunsDataTable,
     RunsGroupMenuButtonComponent,
     RunsGroupMenuButtonContainer,