From 367839f30de3968eff5fecb8b38e1d5782434b6b Mon Sep 17 00:00:00 2001 From: Stephan Lee Date: Fri, 10 Dec 2021 12:40:07 -0800 Subject: [PATCH] chore: add prettier-plugin-sort-imports (#5453) Prettier by default does not sort the imports because it believes in no source code transformation (just does re-print). As such, imports were left to the developer and causes cognitive overhead when authoring a module since we have a soft rule about how it should be ordered. This addition of the plugin automates the formatting of import statements and this change applies the format onto TypeScript files. --- package.json | 1 + .../experimental/plugin_lib/index.ts | 2 +- .../experimental/plugin_lib/runs.ts | 2 +- .../plugin_util/core-host-impl.ts | 1 - .../plugin_util/plugin-host-ipc.ts | 1 - .../plugin_util/plugin_api_host_module.ts | 1 - .../plugin_util/plugin_api_host_test.ts | 1 - .../plugin_util/runs-host-impl.ts | 1 - .../experimental/plugin_util/testing.ts | 1 - .../components/polymer/irons_and_papers.ts | 4 +- .../components/polymer3_interop_helper.ts | 4 +- tensorboard/components/polymer3_lib.ts | 3 +- .../tensor_widget/selection-test.ts | 2 +- .../tensor_widget/shape-utils-test.ts | 2 +- .../tensor_widget/string-utils-test.ts | 2 +- .../tensor_widget/tensor-widget-impl.ts | 24 ++++++------ .../components/tensor_widget/tensor-widget.ts | 2 +- tensorboard/components/tf_backend/backend.ts | 1 - .../components/tf_backend/environmentStore.ts | 3 +- .../components/tf_backend/experimentsStore.ts | 3 +- .../components/tf_backend/runsStore.ts | 3 +- .../tf_backend/tf-backend-polymer.ts | 3 +- .../tf_card_heading/tf-card-heading.ts | 8 ++-- .../categorizationUtils.ts | 2 +- .../tf-tag-filterer.ts | 3 +- .../components/tf_color_scale/colorScale.ts | 6 +-- .../tf_color_scale/tf-color-scale-polymer.ts | 3 +- .../tf_dashboard_common/dashboard-style.ts | 2 +- .../data-loader-behavior.ts | 4 +- .../tf-dashboard-layout.ts | 7 ++-- .../tf_dashboard_common/tf-downloader.ts | 3 +- .../tf-dropdown-trigger.ts | 7 ++-- .../tf-filterable-checkbox-dropdown.ts | 6 +-- .../tf-filterable-checkbox-list.ts | 6 +-- .../tf_dashboard_common/tf-multi-checkbox.ts | 10 ++--- .../tf_dashboard_common/tf-no-data-warning.ts | 2 +- .../tf_dashboard_common/tf-option-selector.ts | 4 +- .../components/tf_globals/globals-polymer.ts | 3 +- .../tf-line-chart-data-loader.ts | 19 +++++----- .../tf_markdown_view/tf-markdown-view.ts | 4 +- .../tf-category-paginated-view.ts | 5 +-- .../tf_paginated_view/tf-dom-repeat.ts | 5 +-- .../tf-paginated-view-store.ts | 3 +- .../tf_runs_selector/tf-runs-selector.ts | 8 ++-- tensorboard/components/tf_storage/storage.ts | 1 - .../tf_storage/tf-storage-polymer.ts | 3 +- .../components/tf_wbr_string/tf-wbr-string.ts | 4 +- .../vz_chart_helpers/vz-chart-helpers.ts | 4 +- .../vz_chart_helpers/vz-chart-tooltip.ts | 5 +-- .../components/vz_line_chart2/line-chart.ts | 8 ++-- .../components/vz_line_chart2/linear-scale.ts | 1 - .../components/vz_line_chart2/log-scale.ts | 3 +- .../vz_line_chart2/microbenchmark/main.ts | 4 +- .../microbenchmark/renders_spec.ts | 2 +- .../vz_line_chart2/microbenchmark/runner.ts | 4 +- .../vz_line_chart2/panZoomDragLayer.ts | 1 - .../vz_line_chart2/vz-line-chart2.ts | 19 ++++------ .../tf_audio_dashboard/tf-audio-dashboard.ts | 5 +-- .../tf_audio_dashboard/tf-audio-loader.ts | 6 +-- .../tf-custom-scalar-dashboard.ts | 6 +-- .../tf-custom-scalar-helpers.ts | 1 - .../tf-custom-scalar-margin-chart-card.ts | 12 +++--- .../tf-custom-scalar-multi-line-chart-card.ts | 7 ++-- .../actions/debugger_actions.ts | 13 +++---- .../data_source/tfdbg2_data_source.ts | 2 +- .../data_source/tfdbg2_data_source_module.ts | 2 +- .../debugger_container.ts | 3 +- .../debugger_container_test.ts | 1 - .../tf_debugger_v2_plugin/debugger_module.ts | 1 - .../effects/debugger_effects.ts | 1 - .../effects/debugger_effects_test.ts | 38 +++++++++---------- .../store/debugger_graphs_reducers_test.ts | 6 +-- .../store/debugger_reducers.ts | 7 ++-- .../store/debugger_reducers_test.ts | 20 +++++----- .../store/debugger_selectors.ts | 6 +-- .../store/debugger_selectors_test.ts | 36 +++++++++--------- .../store/debugger_store_utils.ts | 8 +--- .../tf_debugger_v2_plugin/store/index.ts | 2 +- .../tf_debugger_v2_plugin/testing/index.ts | 20 +++++----- .../views/alerts/alerts_component.ts | 1 - .../views/alerts/alerts_container.ts | 1 - .../views/alerts/alerts_container_test.ts | 10 ++--- .../views/alerts/alerts_module.ts | 1 - .../debug_tensor_value_component.ts | 1 - .../debug_tensor_value_component_test.ts | 3 +- .../debug_tensor_value_module.ts | 1 - .../execution_data_component.ts | 1 - .../execution_data_container.ts | 6 +-- .../execution_data_container_test.ts | 4 +- .../execution_data/execution_data_module.ts | 1 - .../views/graph/graph_component.ts | 1 - .../views/graph/graph_container.ts | 1 - .../views/graph/graph_container_test.ts | 4 +- .../views/graph/graph_module.ts | 1 - .../views/graph/graph_op_component.ts | 1 - .../graph_executions_component.ts | 3 +- .../graph_executions_container.ts | 3 +- .../graph_executions_container_test.ts | 14 +++---- .../graph_executions_module.ts | 1 - .../views/inactive/inactive_module.ts | 1 - .../source_files/source_files_component.ts | 1 - .../source_files/source_files_container.ts | 1 - .../source_files_container_test.ts | 16 ++++---- .../views/source_files/source_files_module.ts | 1 - .../stack_trace/stack_trace_component.ts | 1 - .../stack_trace/stack_trace_container.ts | 3 +- .../stack_trace/stack_trace_container_test.ts | 8 ++-- .../views/stack_trace/stack_trace_module.ts | 1 - .../views/timeline/timeline_component.ts | 2 +- .../views/timeline/timeline_container.ts | 16 ++++---- .../views/timeline/timeline_container_test.ts | 6 +-- .../views/timeline/timeline_module.ts | 1 - .../tf-distribution-dashboard.ts | 7 ++-- .../tf-distribution-loader.ts | 5 +-- .../vz-distribution-chart.ts | 7 ++-- .../graph/tf_graph/tf-graph-minimap.ts | 3 +- .../plugins/graph/tf_graph/tf-graph-scene.ts | 23 +++++------ .../plugins/graph/tf_graph/tf-graph.ts | 11 +++--- .../graph/tf_graph_app/tf-graph-app.ts | 7 ++-- .../graph/tf_graph_board/tf-graph-board.ts | 9 ++--- .../graph/tf_graph_common/common_test.ts | 2 +- .../graph/tf_graph_common/contextmenu.ts | 1 - .../plugins/graph/tf_graph_common/edge.ts | 4 +- .../plugins/graph/tf_graph_common/graph.ts | 2 - .../graph/tf_graph_common/hierarchy.ts | 26 ++++++------- .../plugins/graph/tf_graph_common/layout.ts | 2 - .../plugins/graph/tf_graph_common/loader.ts | 1 - .../plugins/graph/tf_graph_common/node.ts | 14 +++---- .../plugins/graph/tf_graph_common/op.ts | 5 +-- .../plugins/graph/tf_graph_common/parser.ts | 1 - .../plugins/graph/tf_graph_common/render.ts | 1 - .../plugins/graph/tf_graph_common/scene.ts | 2 - .../plugins/graph/tf_graph_common/template.ts | 1 - .../graph/tf_graph_common/tf-graph-icon.ts | 4 +- .../graph/tf_graph_common/tf-node-icon.ts | 8 ++-- .../plugins/graph/tf_graph_common/util.ts | 1 - .../tf_graph_controls/tf-graph-controls.ts | 16 ++++---- .../tf_graph_dashboard/tf-graph-dashboard.ts | 10 ++--- .../tf-graph-debugger-data-card.ts | 11 ++---- .../graph/tf_graph_info/tf-graph-info.ts | 9 ++--- .../graph/tf_graph_info/tf-node-info.ts | 16 ++++---- .../graph/tf_graph_info/tf-node-list-item.ts | 7 ++-- .../tf-graph-dashboard-loader.ts | 8 ++-- .../graph/tf_graph_loader/tf-graph-loader.ts | 5 +-- .../tf-graph-node-search.ts | 6 +-- .../tf-graph-op-compat-card.ts | 10 ++--- .../tf-graph-op-compat-list-item.ts | 5 +-- .../tf-histogram-dashboard.ts | 9 ++--- .../tf-histogram-loader.ts | 8 ++-- .../vz-histogram-timeseries.ts | 3 +- .../tf_hparams_backend/tf-hparams-backend.ts | 2 +- .../tf-hparams-dashboard.ts | 6 +-- .../tf_hparams_main/tf-hparams-main.ts | 8 ++-- .../tf_hparams_parallel_coords_plot/axes.ts | 7 ++-- .../interaction_manager.ts | 6 +-- .../tf_hparams_parallel_coords_plot/lines.ts | 9 ++--- .../tf-hparams-parallel-coords-plot.ts | 1 - .../tf_hparams_parallel_coords_plot/utils.ts | 3 +- .../tf-hparams-parallel-coords-view.ts | 4 +- .../tf-hparams-query-pane.ts | 7 ++-- .../tf-hparams-scale-and-color-controls.ts | 3 +- .../tf-hparams-scatter-plot-matrix-plot.ts | 5 +-- .../tf-hparams-scatter-plot-matrix-view.ts | 2 +- .../tf-hparams-session-group-details.ts | 9 ++--- .../tf-hparams-session-group-values.ts | 2 +- .../tf-hparams-sessions-pane.ts | 3 +- .../tf-hparams-table-view.ts | 7 ++-- .../tf_hparams_utils/hparams-split-layout.ts | 2 +- .../tf_image_dashboard/tf-image-dashboard.ts | 5 +-- .../tf_image_dashboard/tf-image-loader.ts | 3 +- .../array-buffer-data-provider.ts | 2 +- .../mesh/tf_mesh_dashboard/mesh-loader.ts | 12 +++--- .../tf_mesh_dashboard/tf-mesh-dashboard.ts | 15 +++----- .../tf_pr_curve_dashboard/tf-pr-curve-card.ts | 10 ++--- .../tf-pr-curve-dashboard.ts | 7 +--- .../tf-pr-curve-steps-selector.ts | 4 +- .../tf-profile-redirect-dashboard.ts | 5 +-- .../plugins/projector/vz_projector/bundle.ts | 7 ++-- .../vz_projector/data-provider-demo.ts | 2 +- .../vz_projector/data-provider-proto.ts | 8 ++-- .../vz_projector/data-provider-server.ts | 8 ++-- .../plugins/projector/vz_projector/data.ts | 5 +-- .../plugins/projector/vz_projector/knn.ts | 3 +- .../projector/vz_projector/knn_test.ts | 2 +- .../projectorScatterPlotAdapter.ts | 7 ++-- .../projector/vz_projector/scatterPlot.ts | 9 ++--- .../vz_projector/scatterPlotVisualizer.ts | 1 - .../scatterPlotVisualizer3DLabels.ts | 1 - .../scatterPlotVisualizerCanvasLabels.ts | 3 +- .../scatterPlotVisualizerPolylines.ts | 1 - .../scatterPlotVisualizerSprites.ts | 1 - .../plugins/projector/vz_projector/util.ts | 3 +- .../vz_projector/vz-projector-app.ts | 4 +- .../vz-projector-bookmark-panel.html.ts | 2 - .../vz-projector-bookmark-panel.ts | 8 ++-- .../vz_projector/vz-projector-dashboard.ts | 2 +- .../vz-projector-data-panel.html.ts | 3 +- .../vz_projector/vz-projector-data-panel.ts | 26 ++++++------- .../vz_projector/vz-projector-input.ts | 6 +-- .../vz-projector-inspector-panel.ts | 16 ++++---- .../vz_projector/vz-projector-legend.ts | 4 +- .../vz-projector-metadata-card.ts | 6 +-- .../vz-projector-projections-panel.html.ts | 1 - .../vz-projector-projections-panel.ts | 12 +++--- .../vz_projector/vz-projector.html.ts | 1 - .../projector/vz_projector/vz-projector.ts | 32 ++++++++-------- .../tf_scalar_dashboard/tf-scalar-card.ts | 4 +- .../tf-scalar-dashboard.ts | 4 +- .../tf_scalar_dashboard/tf-smoothing-input.ts | 4 +- .../tf_text_dashboard/tf-text-dashboard.ts | 11 ++---- .../text/tf_text_dashboard/tf-text-loader.ts | 16 ++++---- tensorboard/webapp/alert/actions/index.ts | 1 - .../webapp/alert/alert_action_module.ts | 2 +- .../webapp/alert/store/alert_reducers_test.ts | 1 - .../webapp/alert/store/alert_selectors.ts | 4 +- tensorboard/webapp/alert/store/testing.ts | 2 +- .../views/alert_display_snackbar_container.ts | 6 +-- .../alert/views/alert_snackbar_container.ts | 5 +-- .../alert/views/alert_snackbar_module.ts | 5 +-- .../webapp/alert/views/alert_snackbar_test.ts | 10 ++--- tensorboard/webapp/app_module.ts | 1 - .../actions/app_routing_actions.ts | 1 - tensorboard/webapp/app_routing/app_root.ts | 1 - .../webapp/app_routing/app_root_module.ts | 1 - .../webapp/app_routing/app_root_test.ts | 1 - .../webapp/app_routing/app_routing_module.ts | 3 +- .../webapp/app_routing/deep_link_provider.ts | 2 - .../dirty_updates_registry_module.ts | 3 +- .../dirty_updates_registry_module_test.ts | 1 - .../dirty_updates_registry_types.ts | 1 - .../effects/app_routing_effects.ts | 3 +- .../effects/app_routing_effects_test.ts | 6 +-- tensorboard/webapp/app_routing/location.ts | 1 - .../programmatical_navigation_module.ts | 3 +- .../programmatical_navigation_module_test.ts | 1 - .../programmatical_navigation_types.ts | 1 - .../webapp/app_routing/route_config_test.ts | 1 - .../webapp/app_routing/route_config_types.ts | 1 - .../route_contexted_reducer_helper.ts | 1 - .../route_contexted_reducer_helper_test.ts | 1 - .../app_routing/route_registry_module.ts | 1 - .../app_routing/route_registry_module_test.ts | 1 - .../store/app_routing_reducers_test.ts | 1 - .../store/app_routing_selectors.ts | 14 +++---- .../store/app_routing_selectors_test.ts | 1 - .../webapp/app_routing/store/testing.ts | 2 +- tensorboard/webapp/app_routing/testing.ts | 5 +-- .../views/app_routing_view_module.ts | 6 +-- .../views/router_link_directive_container.ts | 9 +---- .../app_routing/views/router_link_test.ts | 2 - .../views/router_outlet_container.ts | 1 - .../app_routing/views/router_outlet_test.ts | 2 - tensorboard/webapp/app_state.ts | 6 +-- tensorboard/webapp/bootstrap.ts | 1 - .../webapp/core/actions/core_actions.ts | 1 - tensorboard/webapp/core/core_module.ts | 1 - .../webapp/core/effects/core_effects.ts | 4 +- .../webapp/core/effects/core_effects_test.ts | 1 - .../core/store/core_initial_state_provider.ts | 4 +- .../store/core_initial_state_provider_test.ts | 2 +- .../webapp/core/store/core_reducers.ts | 1 - .../webapp/core/store/core_selectors.ts | 1 - tensorboard/webapp/core/store/core_types.ts | 1 - tensorboard/webapp/core/testing/index.ts | 2 +- .../views/dark_mode_supporter_container.ts | 1 - .../core/views/dark_mode_supporter_module.ts | 1 - .../core/views/dark_mode_supporter_test.ts | 1 - .../core/views/hash_storage_component.ts | 1 - .../core/views/hash_storage_container.ts | 8 ++-- .../webapp/core/views/hash_storage_module.ts | 7 ++-- .../webapp/core/views/hash_storage_test.ts | 16 ++++---- .../webapp/core/views/layout_container.ts | 3 +- .../webapp/core/views/layout_module.ts | 1 - tensorboard/webapp/core/views/layout_test.ts | 1 - .../webapp/core/views/page_title_container.ts | 12 +++--- .../webapp/core/views/page_title_module.ts | 5 +-- .../webapp/core/views/page_title_test.ts | 14 +++---- .../customization/customization_module.ts | 1 - .../customization/customization_test.ts | 1 - .../webapp/deeplink/deeplink_module.ts | 3 +- tensorboard/webapp/deeplink/deeplink_test.ts | 1 - tensorboard/webapp/deeplink/hash.ts | 1 - tensorboard/webapp/deeplink/hash_test.ts | 1 - tensorboard/webapp/deeplink/index.ts | 2 +- .../webapp/experiments/experiments_module.ts | 1 - .../experiments/store/experiments_reducers.ts | 2 - .../store/experiments_selectors.ts | 4 +- .../webapp/experiments/store/testing.ts | 4 +- .../actions/feature_flag_actions.ts | 1 - .../effects/feature_flag_effects.ts | 7 ++-- .../effects/feature_flag_effects_test.ts | 1 - .../feature_flag/feature_flag_module.ts | 1 - .../store/feature_flag_reducers.ts | 1 - .../store/feature_flag_selectors.ts | 3 +- .../feature_flag_store_config_provider.ts | 1 - .../webapp/feature_flag/store/testing.ts | 2 +- .../header/dark_mode_toggle_container.ts | 3 +- .../webapp/header/dark_mode_toggle_test.ts | 1 - tensorboard/webapp/header/header_module.ts | 7 +--- tensorboard/webapp/header/header_test.ts | 1 - .../header/plugin_selector_component.ts | 3 +- .../header/plugin_selector_container.ts | 6 +-- tensorboard/webapp/header/reload_container.ts | 1 - tensorboard/webapp/header/types.ts | 2 +- .../webapp/hparams/_redux/hparams_actions.ts | 1 - .../webapp/hparams/_redux/hparams_module.ts | 3 +- .../webapp/hparams/_redux/hparams_reducers.ts | 1 - .../hparams/_redux/hparams_reducers_test.ts | 2 +- .../hparams/_redux/hparams_selectors.ts | 1 - .../hparams/_redux/hparams_selectors_utils.ts | 2 +- tensorboard/webapp/hparams/_redux/utils.ts | 2 +- tensorboard/webapp/hparams/hparams_module.ts | 1 - tensorboard/webapp/hparams/types.ts | 3 +- tensorboard/webapp/main_prod.ts | 1 - tensorboard/webapp/mat_icon_module.ts | 2 +- tensorboard/webapp/metrics/actions/index.ts | 1 - .../data_source/metrics_data_source.ts | 1 - .../data_source/metrics_data_source_module.ts | 1 - .../data_source/metrics_data_source_test.ts | 1 - .../webapp/metrics/data_source/types.ts | 3 +- tensorboard/webapp/metrics/effects/index.ts | 1 - .../metrics/effects/metrics_effects_test.ts | 17 ++++----- .../metrics/metrics_integration_test.ts | 1 - tensorboard/webapp/metrics/metrics_module.ts | 1 - tensorboard/webapp/metrics/store/index.ts | 2 +- .../store/metrics_initial_state_provider.ts | 1 - .../webapp/metrics/store/metrics_reducers.ts | 7 ++-- .../webapp/metrics/store/metrics_selectors.ts | 1 - .../store/metrics_store_internal_utils.ts | 2 - .../metrics_store_internal_utils_test.ts | 6 +-- .../webapp/metrics/store/metrics_types.ts | 6 +-- tensorboard/webapp/metrics/testing.ts | 1 - tensorboard/webapp/metrics/utils_test.ts | 3 +- .../views/card_renderer/card_lazy_loader.ts | 1 - .../card_renderer/card_lazy_loader_test.ts | 1 - .../card_renderer/card_renderer_module.ts | 1 - .../card_renderer/card_view_component.ts | 1 - .../card_renderer/card_view_container.ts | 1 - .../views/card_renderer/card_view_test.ts | 1 - .../data_download_dialog_component.ts | 3 +- .../data_download_dialog_container.ts | 5 +-- .../data_download_dialog_test.ts | 1 - .../card_renderer/data_download_module.ts | 1 - .../card_renderer/histogram_card_container.ts | 5 +-- .../card_renderer/histogram_card_module.ts | 2 - .../card_renderer/histogram_card_test.ts | 4 +- .../card_renderer/image_card_component.ts | 1 - .../card_renderer/image_card_container.ts | 3 +- .../views/card_renderer/image_card_module.ts | 1 - .../views/card_renderer/image_card_test.ts | 14 +++---- .../views/card_renderer/run_name_component.ts | 1 - .../views/card_renderer/run_name_container.ts | 2 - .../views/card_renderer/run_name_module.ts | 3 +- .../views/card_renderer/run_name_test.ts | 4 +- .../card_renderer/scalar_card_component.ts | 3 +- .../card_renderer/scalar_card_container.ts | 1 - .../views/card_renderer/scalar_card_module.ts | 1 - .../views/card_renderer/scalar_card_test.ts | 1 - .../metrics/views/card_renderer/utils_test.ts | 1 - .../vis_selected_time_clipped_component.ts | 1 - .../vis_selected_time_clipped_module.ts | 1 - .../views/main_view/card_grid_component.ts | 2 - .../views/main_view/card_grid_container.ts | 5 +-- .../metrics/views/main_view/card_grid_test.ts | 11 +++--- .../main_view/card_group_toolbar_container.ts | 15 ++------ .../views/main_view/card_groups_component.ts | 2 - .../views/main_view/card_groups_container.ts | 3 +- .../views/main_view/common_selectors.ts | 3 +- .../empty_tag_match_message_component.ts | 1 - .../empty_tag_match_message_container.ts | 1 - .../views/main_view/filter_input_component.ts | 1 - .../views/main_view/filter_input_container.ts | 1 - .../views/main_view/filter_input_test.ts | 4 +- .../main_view/filtered_view_component.ts | 1 - .../main_view/filtered_view_container.ts | 1 - .../views/main_view/main_view_component.ts | 1 - .../views/main_view/main_view_container.ts | 3 +- .../views/main_view/main_view_module.ts | 1 - .../metrics/views/main_view/main_view_test.ts | 10 ++--- .../views/main_view/pinned_view_container.ts | 1 - .../webapp/metrics/views/metrics_container.ts | 1 - .../metrics/views/metrics_container_test.ts | 1 - .../views/metrics_promo_notice_container.ts | 1 - .../metrics/views/metrics_views_module.ts | 1 - .../views/right_pane/right_pane_module.ts | 1 - .../views/right_pane/right_pane_test.ts | 4 +- .../right_pane/settings_view_component.ts | 3 +- .../right_pane/settings_view_container.ts | 5 +-- .../notification_center/_data_source/index.ts | 2 +- .../notification_center_data_source.ts | 1 - .../notification_center_data_source_module.ts | 3 +- .../notification_center_data_source_test.ts | 1 - .../_data_source/testing.ts | 3 +- .../_notification_center_module.ts | 1 - .../_redux/notification_center_actions.ts | 1 - .../_redux/notification_center_effects.ts | 1 - .../notification_center_effects_test.ts | 2 +- .../_redux/notification_center_reducers.ts | 1 - .../notification_center/_redux/testing.ts | 2 +- .../_views/views_module.ts | 1 - tensorboard/webapp/oss_plugins_module.ts | 1 - .../persistent_settings_data_source.ts | 1 - .../persistent_settings_data_source_module.ts | 3 +- .../persistent_settings_data_source_test.ts | 1 - .../_data_source/testing.ts | 1 - .../_redux/persistent_settings_actions.ts | 1 - .../_redux/persistent_settings_effects.ts | 3 +- .../persistent_settings_effects_test.ts | 1 - .../webapp/persistent_settings/index.ts | 4 +- .../persistent_settings_config_module.ts | 1 - .../persistent_settings_config_module_test.ts | 1 - .../persistent_settings_config_types.ts | 1 - .../persistent_settings_module.ts | 1 - .../plugins/npmi/actions/npmi_actions.ts | 2 +- .../npmi/data_source/npmi_data_source.ts | 14 +++---- .../data_source/npmi_data_source_module.ts | 2 +- .../npmi/data_source/npmi_data_source_test.ts | 3 +- .../plugins/npmi/effects/npmi_effects.ts | 18 ++++----- .../plugins/npmi/effects/npmi_effects_test.ts | 17 ++++----- .../webapp/plugins/npmi/npmi_container.ts | 5 +-- .../plugins/npmi/npmi_container_test.ts | 10 ++--- .../webapp/plugins/npmi/npmi_module.ts | 14 +++---- .../webapp/plugins/npmi/store/index.ts | 2 +- .../plugins/npmi/store/npmi_reducers.ts | 12 +++--- .../plugins/npmi/store/npmi_reducers_test.ts | 4 +- .../plugins/npmi/store/npmi_selectors.ts | 16 ++++---- .../plugins/npmi/store/npmi_selectors_test.ts | 34 ++++++++--------- .../webapp/plugins/npmi/store/npmi_types.ts | 2 +- .../webapp/plugins/npmi/testing/index.ts | 4 +- .../plugins/npmi/util/coordinate_data.ts | 2 +- .../plugins/npmi/util/coordinate_data_test.ts | 2 +- .../plugins/npmi/util/filter_annotations.ts | 2 +- .../npmi/util/filter_annotations_test.ts | 4 +- .../npmi/util/sort_annotations_test.ts | 6 +-- .../webapp/plugins/npmi/util/umap_test.ts | 2 +- .../webapp/plugins/npmi/util/violin_data.ts | 3 +- .../plugins/npmi/util/violin_data_test.ts | 2 +- .../annotation/annotation_component.ts | 18 ++++----- .../annotation/annotation_container.ts | 15 ++++---- .../annotation/annotation_module.ts | 4 +- .../annotation/annotation_test.ts | 24 +++++------- .../annotations_list_component.ts | 3 +- .../annotations_list_container.ts | 22 +++++------ .../annotations_list_module.ts | 5 +-- .../annotations_list/annotations_list_test.ts | 6 +-- .../annotations_list_toolbar_component.ts | 2 +- .../annotations_list_toolbar_container.ts | 9 ++--- .../annotations_list_toolbar_module.ts | 2 - .../annotations_list_toolbar_test.ts | 12 +++--- .../annotations_search_component.ts | 4 +- .../annotations_search_container.ts | 5 +-- .../annotations_search_module.ts | 2 - .../annotations_search_test.ts | 13 +++---- .../header/header_component.ts | 4 +- .../header/header_container.ts | 7 ++-- .../annotations_list/header/header_module.ts | 2 - .../annotations_list/header/header_test.ts | 14 +++---- .../legend_element_component.ts | 4 +- .../legend_element/legend_element_module.ts | 1 - .../legend_element/legend_element_test.ts | 3 +- .../annotations_list/legend/legend_module.ts | 1 - .../annotations_list/legend/legend_test.ts | 1 - .../data_selection_component.ts | 2 +- .../data_selection/data_selection_module.ts | 5 +-- .../data_selection/data_selection_test.ts | 8 ++-- .../metric_arithmetic_container.ts | 4 +- .../metric_arithmetic_element_component.ts | 10 ++--- .../metric_arithmetic_element_container.ts | 8 ++-- .../metric_arithmetic_element_module.ts | 3 +- .../metric_arithmetic_element_test.ts | 17 ++++----- .../metric_arithmetic_module.ts | 1 - .../metric_arithmetic_operator_module.ts | 1 - .../metric_arithmetic_operator_test.ts | 3 +- .../metric_arithmetic_test.ts | 10 ++--- .../metric_search/metric_search_component.ts | 4 +- .../metric_search/metric_search_container.ts | 10 ++--- .../metric_search/metric_search_module.ts | 4 +- .../metric_search/metric_search_test.ts | 17 ++++----- .../results_download_component.ts | 3 +- .../results_download_container.ts | 10 ++--- .../results_download_module.ts | 4 +- .../results_download/results_download_test.ts | 11 ++---- .../views/embeddings/embeddings_component.ts | 2 +- .../views/embeddings/embeddings_container.ts | 6 +-- .../views/embeddings/embeddings_module.ts | 10 ++--- .../npmi/views/embeddings/embeddings_test.ts | 15 +++----- .../npmi/views/inactive/inactive_module.ts | 1 - .../plugins/npmi/views/main/main_component.ts | 2 +- .../plugins/npmi/views/main/main_container.ts | 6 +-- .../npmi/views/main/main_container_test.ts | 15 +++----- .../plugins/npmi/views/main/main_module.ts | 12 +++--- .../parallel_coordinates_component.ts | 10 ++--- .../parallel_coordinates_container.ts | 26 ++++++------- .../parallel_coordinates_module.ts | 1 - .../parallel_coordinates_test.ts | 24 ++++++------ .../selected_annotations_component.ts | 2 +- .../selected_annotations_container.ts | 5 +-- .../selected_annotations_module.ts | 4 +- .../selected_annotations_test.ts | 12 +++--- .../violin_filter/violin_filter_component.ts | 14 +++---- .../violin_filter/violin_filter_container.ts | 20 +++++----- .../violin_filter/violin_filter_module.ts | 2 - .../violin_filter/violin_filter_test.ts | 18 ++++----- .../violin_filters_component.ts | 2 +- .../violin_filters_container.ts | 8 ++-- .../violin_filters/violin_filters_module.ts | 4 +- .../violin_filters/violin_filters_test.ts | 12 +++--- .../webapp/plugins/plugin_registry_module.ts | 6 +-- .../webapp/plugins/plugins_component.ts | 14 +++---- .../webapp/plugins/plugins_container.ts | 16 ++++---- .../webapp/plugins/plugins_container_test.ts | 1 - tensorboard/webapp/plugins/plugins_module.ts | 7 ++-- .../plugins/text_v2/actions/text_actions.ts | 1 - .../data_source/text_v2_data_source_module.ts | 2 - .../data_source/text_v2_data_source_test.ts | 4 +- .../data_source/text_v2_server_data_source.ts | 2 - .../plugins/text_v2/effects/text_effects.ts | 17 ++++----- .../text_v2/effects/text_effects_test.ts | 22 +++++------ .../plugins/text_v2/store/text_v2_reducers.ts | 3 +- .../text_v2/store/text_v2_selectors.ts | 5 +-- .../text_v2/store/text_v2_selectors_test.ts | 3 +- .../webapp/plugins/text_v2/text_v2_module.ts | 7 ++-- .../text_dashboard/text_dashboard_module.ts | 1 - .../webapp/reloader/reloader_component.ts | 7 ++-- .../reloader/reloader_component_test.ts | 12 +++--- .../webapp/reloader/reloader_module.ts | 1 - .../routes/dashboard_deeplink_provider.ts | 7 ++-- .../dashboard_deeplink_provider_test.ts | 3 +- tensorboard/webapp/routes/index.ts | 3 +- .../webapp/runs/actions/runs_actions.ts | 1 - .../runs/data_source/runs_data_source.ts | 2 - .../data_source/runs_data_source_module.ts | 1 - .../runs/data_source/runs_data_source_test.ts | 2 - .../data_source/runs_data_source_types.ts | 1 - .../webapp/runs/data_source/testing.ts | 1 - .../webapp/runs/effects/runs_effects.ts | 13 ++++--- .../webapp/runs/effects/runs_effects_test.ts | 9 ++--- .../webapp/runs/store/runs_selectors.ts | 1 - .../runs_selector/runs_selector_component.ts | 1 - .../runs_selector/runs_selector_container.ts | 1 - .../runs_selector/runs_selector_module.ts | 2 - .../views/runs_selector/runs_selector_test.ts | 1 - .../runs_table/regex_edit_dialog_container.ts | 1 - .../runs_table/regex_edit_dialog_test.ts | 1 - .../runs_group_menu_button_component.ts | 1 - .../runs_group_menu_button_container.ts | 4 +- .../views/runs_table/runs_table_component.ts | 11 ++---- .../views/runs_table/runs_table_container.ts | 3 +- .../views/runs_table/runs_table_module.ts | 1 - .../runs/views/runs_table/runs_table_test.ts | 3 +- .../webapp/runs/views/runs_table/types.ts | 4 +- tensorboard/webapp/runs_legacy/runs_module.ts | 1 - .../legacy_runs_selector_component.ts | 2 +- .../legacy_runs_selector_container.ts | 1 - .../legacy_runs_selector_module.ts | 3 +- .../legacy_runs_selector_test.ts | 12 +++--- .../settings/_redux/settings_reducers.ts | 2 +- .../settings/_redux/settings_reducers_test.ts | 6 +-- .../settings/_redux/settings_selectors.ts | 1 - .../_views/polymer_interop_container.ts | 10 ++--- .../settings/_views/polymer_interop_test.ts | 9 ++--- .../_views/settings_button_component.ts | 1 - .../_views/settings_button_container.ts | 1 - .../_views/settings_dialog_component.ts | 15 ++++---- .../_views/settings_dialog_container.ts | 13 +++---- .../webapp/settings/_views/settings_module.ts | 5 +-- .../webapp/settings/_views/settings_test.ts | 21 +++++----- .../webapp/settings/settings_module.ts | 7 ++-- tensorboard/webapp/settings/testing.ts | 2 +- tensorboard/webapp/store_module.ts | 1 - .../webapp/tb_wrapper/tb_wrapper_module.ts | 3 +- .../tbdev_upload_button_component.ts | 1 - .../tbdev_upload_dialog_container.ts | 3 +- .../tbdev_upload/tbdev_upload_module.ts | 3 +- .../webapp/tbdev_upload/tbdev_upload_test.ts | 8 ++-- .../webapp/testing/integration_test_module.ts | 3 +- .../webapp/util/local_storage_testing.ts | 1 - tensorboard/webapp/util/ngrx_test.ts | 1 - tensorboard/webapp/util/ui_selectors.ts | 1 - .../tb_feature_flag_data_source.ts | 3 +- .../tb_feature_flag_data_source_test.ts | 1 - .../tb_feature_flag_data_source_types.ts | 1 - .../tb_feature_flag_module.ts | 5 +-- .../tb_feature_flag_testing.ts | 1 - .../webapp_data_source/tb_http_client.ts | 13 +++---- .../tb_http_client_module.ts | 2 +- .../webapp_data_source/tb_http_client_test.ts | 5 +-- .../tb_http_client_testing.ts | 6 +-- .../tb_server_data_source.ts | 9 ++--- .../tb_server_data_source_module.ts | 1 - .../tb_server_data_source_test.ts | 7 ++-- .../content_wrapping_input_module.ts | 1 - .../content_wrapping_input_test.ts | 1 - .../widgets/dropdown/dropdown_module.ts | 1 - .../experiment_alias_component.ts | 1 - .../experiment_alias_module.ts | 1 - .../experiment_alias/experiment_alias_test.ts | 1 - .../filter_input/filter_input_module.ts | 1 - .../widgets/filter_input/filter_input_test.ts | 4 +- .../widgets/histogram/histogram_component.ts | 1 - .../widgets/histogram/histogram_module.ts | 1 - .../widgets/histogram/histogram_test.ts | 1 - .../intersection_observer_module.ts | 1 - .../intersection_observer_test.ts | 1 - .../line_chart_v2/lib/coordinator_test.ts | 4 +- .../line_chart_v2/lib/formatter_test.ts | 2 +- .../lib/renderer/renderer_test.ts | 1 - .../lib/renderer/threejs_renderer.ts | 1 - .../line_chart_v2/lib/threejs_coordinator.ts | 2 - .../line_chart_v2/lib/worker/worker_chart.ts | 2 +- .../lib/worker/worker_chart_bridge.ts | 2 +- .../line_chart_v2/line_chart_component.ts | 3 -- .../line_chart_component_test.ts | 1 - .../line_chart_internal_utils_test.ts | 8 ++-- .../line_chart_v2/line_chart_module.ts | 7 ++-- .../sub_view/line_chart_axis_view_test.ts | 3 +- .../sub_view/line_chart_grid_view.ts | 1 - .../sub_view/line_chart_grid_view_test.ts | 3 +- .../sub_view/line_chart_interactive_view.ts | 1 - .../line_chart_interactive_view_test.ts | 1 - .../line_chart_v2/sub_view/sub_view_module.ts | 1 - .../linked_time_fob/linked_time_fob_module.ts | 1 - .../markdown_renderer_component_test.ts | 3 +- .../markdown_renderer_module.ts | 1 - .../widgets/range_input/range_input_module.ts | 1 - .../widgets/range_input/range_input_test.ts | 1 - .../webapp/widgets/resize_detector_module.ts | 1 - .../webapp/widgets/resize_detector_test.ts | 1 - .../source_code/source_code_component.ts | 1 - .../source_code/source_code_container.ts | 1 - .../source_code/source_code_container_test.ts | 1 - .../source_code/source_code_diff_container.ts | 1 - .../source_code_diff_container_test.ts | 1 - .../widgets/source_code/source_code_module.ts | 1 - .../widgets/text/truncated_path_module.ts | 1 - .../widgets/text/truncated_path_test.ts | 1 - yarn.lock | 5 +++ 637 files changed, 1122 insertions(+), 1836 deletions(-) diff --git a/package.json b/package.json index 072d0bb191..5ffcd6817e 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ "karma-requirejs": "^1.1.0", "karma-sourcemap-loader": "^0.3.8", "prettier": "2.4.1", + "prettier-plugin-organize-imports": "2.3.4", "requirejs": "^2.3.6", "rollup": "^2.56.2", "terser": "^5.7.1", diff --git a/tensorboard/components/experimental/plugin_lib/index.ts b/tensorboard/components/experimental/plugin_lib/index.ts index 7a7ae1f6dd..04e5152f02 100644 --- a/tensorboard/components/experimental/plugin_lib/index.ts +++ b/tensorboard/components/experimental/plugin_lib/index.ts @@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import * as _runs from './runs'; import * as _core from './core'; +import * as _runs from './runs'; export const core = _core; export const runs = _runs; diff --git a/tensorboard/components/experimental/plugin_lib/runs.ts b/tensorboard/components/experimental/plugin_lib/runs.ts index 3cd4ce7d00..0419cec22d 100644 --- a/tensorboard/components/experimental/plugin_lib/runs.ts +++ b/tensorboard/components/experimental/plugin_lib/runs.ts @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {sendMessage, listen} from './plugin-guest'; +import {listen, sendMessage} from './plugin-guest'; export async function getRuns() { return sendMessage('experimental.GetRuns'); diff --git a/tensorboard/components/experimental/plugin_util/core-host-impl.ts b/tensorboard/components/experimental/plugin_util/core-host-impl.ts index 3979252492..4a70dcea0c 100644 --- a/tensorboard/components/experimental/plugin_util/core-host-impl.ts +++ b/tensorboard/components/experimental/plugin_util/core-host-impl.ts @@ -18,7 +18,6 @@ limitations under the License. import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; import {distinctUntilChanged, filter} from 'rxjs/operators'; - import {State} from '../../../webapp/app_state'; import {getAppLastLoadedTimeInMs} from '../../../webapp/selectors'; import {TfStorageElement} from '../../../webapp/tb_polymer_interop_types'; diff --git a/tensorboard/components/experimental/plugin_util/plugin-host-ipc.ts b/tensorboard/components/experimental/plugin_util/plugin-host-ipc.ts index dc1dca432a..6ddc61ecfa 100644 --- a/tensorboard/components/experimental/plugin_util/plugin-host-ipc.ts +++ b/tensorboard/components/experimental/plugin_util/plugin-host-ipc.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Injectable} from '@angular/core'; - import {IPC, MessageCallback, MessageType, PayloadType} from './message'; /** diff --git a/tensorboard/components/experimental/plugin_util/plugin_api_host_module.ts b/tensorboard/components/experimental/plugin_util/plugin_api_host_module.ts index 4435a6fe69..ee25210d6a 100644 --- a/tensorboard/components/experimental/plugin_util/plugin_api_host_module.ts +++ b/tensorboard/components/experimental/plugin_util/plugin_api_host_module.ts @@ -17,7 +17,6 @@ import {NgModule} from '@angular/core'; import {AppRoutingModule} from '../../../webapp/app_routing/app_routing_module'; import {CoreModule} from '../../../webapp/core/core_module'; import {RunsModule} from '../../../webapp/runs/runs_module'; - import {PluginCoreApiHostImpl} from './core-host-impl'; import {Ipc, registerPluginIframe} from './plugin-host-ipc'; import {PluginRunsApiHostImpl} from './runs-host-impl'; diff --git a/tensorboard/components/experimental/plugin_util/plugin_api_host_test.ts b/tensorboard/components/experimental/plugin_util/plugin_api_host_test.ts index 773fa15b46..a9dbf548d2 100644 --- a/tensorboard/components/experimental/plugin_util/plugin_api_host_test.ts +++ b/tensorboard/components/experimental/plugin_util/plugin_api_host_test.ts @@ -16,7 +16,6 @@ import {TestBed} from '@angular/core/testing'; import {Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {of} from 'rxjs'; - import {State} from '../../../webapp/app_state'; import {buildRun} from '../../../webapp/runs/store/testing'; import { diff --git a/tensorboard/components/experimental/plugin_util/runs-host-impl.ts b/tensorboard/components/experimental/plugin_util/runs-host-impl.ts index 22b5881442..67f38f5077 100644 --- a/tensorboard/components/experimental/plugin_util/runs-host-impl.ts +++ b/tensorboard/components/experimental/plugin_util/runs-host-impl.ts @@ -19,7 +19,6 @@ import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; import {combineLatest, of} from 'rxjs'; import {distinctUntilChanged, map, mergeMap, take} from 'rxjs/operators'; - import {State} from '../../../webapp/app_state'; import {getExperimentIdsFromRoute, getRuns} from '../../../webapp/selectors'; import {MessageId} from './message_types'; diff --git a/tensorboard/components/experimental/plugin_util/testing.ts b/tensorboard/components/experimental/plugin_util/testing.ts index 112c97e7c8..e7a89c5228 100644 --- a/tensorboard/components/experimental/plugin_util/testing.ts +++ b/tensorboard/components/experimental/plugin_util/testing.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Injectable} from '@angular/core'; - import {MessageType, PayloadType} from './message'; import {Ipc, PluginHostCallback} from './plugin-host-ipc'; import {PluginApiHostModule} from './plugin_api_host_module'; diff --git a/tensorboard/components/polymer/irons_and_papers.ts b/tensorboard/components/polymer/irons_and_papers.ts index 9d2b621d37..23b3fc88ad 100644 --- a/tensorboard/components/polymer/irons_and_papers.ts +++ b/tensorboard/components/polymer/irons_and_papers.ts @@ -27,8 +27,8 @@ import '@polymer/iron-list/iron-list'; import '@polymer/iron-pages'; import '@polymer/paper-button'; import '@polymer/paper-checkbox'; -import '@polymer/paper-dialog-scrollable'; import '@polymer/paper-dialog'; +import '@polymer/paper-dialog-scrollable'; import '@polymer/paper-dropdown-menu/paper-dropdown-menu'; import '@polymer/paper-header-panel'; import '@polymer/paper-icon-button/paper-icon-button'; @@ -42,8 +42,8 @@ import '@polymer/paper-progress'; import '@polymer/paper-radio-button'; import '@polymer/paper-radio-group'; import '@polymer/paper-slider'; -import '@polymer/paper-spinner/paper-spinner-lite'; import '@polymer/paper-spinner/paper-spinner'; +import '@polymer/paper-spinner/paper-spinner-lite'; import '@polymer/paper-styles/paper-styles'; import '@polymer/paper-tabs'; import '@polymer/paper-toast'; diff --git a/tensorboard/components/polymer3_interop_helper.ts b/tensorboard/components/polymer3_interop_helper.ts index d229b2cc26..2ab3ce7cc7 100644 --- a/tensorboard/components/polymer3_interop_helper.ts +++ b/tensorboard/components/polymer3_interop_helper.ts @@ -17,7 +17,7 @@ limitations under the License. * Exports components necessary for Polymer <-> Angular interop. */ import './tf_backend/tf-backend-polymer'; +import './tf_color_scale/tf-color-scale-polymer'; import './tf_globals/globals-polymer'; -import './tf_storage/tf-storage-polymer'; import './tf_paginated_view/tf-paginated-view-store'; -import './tf_color_scale/tf-color-scale-polymer'; +import './tf_storage/tf-storage-polymer'; diff --git a/tensorboard/components/polymer3_lib.ts b/tensorboard/components/polymer3_lib.ts index 1c5e04dc55..32d0c8d0f7 100644 --- a/tensorboard/components/polymer3_lib.ts +++ b/tensorboard/components/polymer3_lib.ts @@ -22,9 +22,8 @@ import '../plugins/histogram/tf_histogram_dashboard/tf-histogram-dashboard'; import '../plugins/hparams/tf_hparams_dashboard/tf-hparams-dashboard'; import '../plugins/image/tf_image_dashboard/tf-image-dashboard'; import '../plugins/mesh/tf_mesh_dashboard/tf-mesh-dashboard'; -import '../plugins/pr_curve/tf_pr_curve_dashboard/tf-pr-curve-dashboard'; import '../plugins/profile_redirect/tf_profile_redirect_dashboard/tf-profile-redirect-dashboard'; +import '../plugins/pr_curve/tf_pr_curve_dashboard/tf-pr-curve-dashboard'; import '../plugins/scalar/tf_scalar_dashboard/tf-scalar-dashboard'; import '../plugins/text/tf_text_dashboard/tf-text-dashboard'; - import './polymer3_interop_helper'; diff --git a/tensorboard/components/tensor_widget/selection-test.ts b/tensorboard/components/tensor_widget/selection-test.ts index 586c625502..396bd96599 100644 --- a/tensorboard/components/tensor_widget/selection-test.ts +++ b/tensorboard/components/tensor_widget/selection-test.ts @@ -15,8 +15,8 @@ limitations under the License. /** Unit tests for selection. */ -import {MoveDirection, Shape, TensorViewSlicingSpec, TensorView} from './types'; import {TensorElementSelection} from './selection'; +import {MoveDirection, Shape, TensorViewSlicingSpec} from './types'; describe('TensorElementSelection', () => { it('Scalar shape', () => { diff --git a/tensorboard/components/tensor_widget/shape-utils-test.ts b/tensorboard/components/tensor_widget/shape-utils-test.ts index ec2d0a8e4f..025fe51820 100644 --- a/tensorboard/components/tensor_widget/shape-utils-test.ts +++ b/tensorboard/components/tensor_widget/shape-utils-test.ts @@ -14,9 +14,9 @@ limitations under the License. ==============================================================================*/ import { + areSlicingSpecsCompatible, formatShapeForDisplay, getDefaultSlicingSpec, - areSlicingSpecsCompatible, numElements, } from './shape-utils'; import {TensorViewSlicingSpec} from './types'; diff --git a/tensorboard/components/tensor_widget/string-utils-test.ts b/tensorboard/components/tensor_widget/string-utils-test.ts index 9871de92d1..175973e54e 100644 --- a/tensorboard/components/tensor_widget/string-utils-test.ts +++ b/tensorboard/components/tensor_widget/string-utils-test.ts @@ -18,8 +18,8 @@ import { ELLIPSES, formatTensorName, numericValueToString, - TENSOR_NAME_LENGTH_CUTOFF, stringValueToDisplayString, + TENSOR_NAME_LENGTH_CUTOFF, } from './string-utils'; function stringRepeat(str: string, times: number) { diff --git a/tensorboard/components/tensor_widget/tensor-widget-impl.ts b/tensorboard/components/tensor_widget/tensor-widget-impl.ts index 8d6972c0d6..33b3226b2c 100644 --- a/tensorboard/components/tensor_widget/tensor-widget-impl.ts +++ b/tensorboard/components/tensor_widget/tensor-widget-impl.ts @@ -13,12 +13,22 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +import { + ColorMap, + ColorMapConfig, + GrayscaleColorMap, + JetColorMap, +} from './colormap'; import { isBooleanDType, isFloatDType, isIntegerDType, isStringDType, } from './dtype-utils'; +import { + BaseTensorNumericSummary, + BooleanOrNumericTensorNumericSummary, +} from './health-pill-types'; import { ChoiceMenuItemConfig, Menu, @@ -27,9 +37,9 @@ import { } from './menu'; import {TensorElementSelection} from './selection'; import { + areSlicingSpecsCompatible, formatShapeForDisplay, getDefaultSlicingSpec, - areSlicingSpecsCompatible, } from './shape-utils'; import {SlicingControl} from './slicing-control'; import { @@ -41,20 +51,10 @@ import { import { MoveDirection, TensorView, + TensorViewSlicingSpec, TensorWidget, TensorWidgetOptions, - TensorViewSlicingSpec, } from './types'; -import { - BaseTensorNumericSummary, - BooleanOrNumericTensorNumericSummary, -} from './health-pill-types'; -import { - ColorMap, - ColorMapConfig, - GrayscaleColorMap, - JetColorMap, -} from './colormap'; const DETAILED_VALUE_ATTR_KEY = 'detailed-value'; diff --git a/tensorboard/components/tensor_widget/tensor-widget.ts b/tensorboard/components/tensor_widget/tensor-widget.ts index f7e523d4fc..6d30c49306 100644 --- a/tensorboard/components/tensor_widget/tensor-widget.ts +++ b/tensorboard/components/tensor_widget/tensor-widget.ts @@ -14,7 +14,7 @@ limitations under the License. ==============================================================================*/ import {TensorWidgetImpl} from './tensor-widget-impl'; -import {TensorWidget, TensorWidgetOptions, TensorView} from './types'; +import {TensorView, TensorWidget, TensorWidgetOptions} from './types'; export {Shape, TensorView} from './types'; export {VERSION} from './version'; diff --git a/tensorboard/components/tf_backend/backend.ts b/tensorboard/components/tf_backend/backend.ts index 3f093af710..dd981844ea 100644 --- a/tensorboard/components/tf_backend/backend.ts +++ b/tensorboard/components/tf_backend/backend.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as _ from 'lodash'; - import * as vz_sorting from '../vz_sorting/sorting'; export type RunToTag = { diff --git a/tensorboard/components/tf_backend/environmentStore.ts b/tensorboard/components/tf_backend/environmentStore.ts index fdcd1b0420..d23aa6db62 100644 --- a/tensorboard/components/tf_backend/environmentStore.ts +++ b/tensorboard/components/tf_backend/environmentStore.ts @@ -13,9 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as _ from 'lodash'; - -import {getRouter} from './router'; import {BaseStore} from './baseStore'; +import {getRouter} from './router'; interface Environment { dataLocation: string; diff --git a/tensorboard/components/tf_backend/experimentsStore.ts b/tensorboard/components/tf_backend/experimentsStore.ts index ea8b0697b0..835dd38fd3 100644 --- a/tensorboard/components/tf_backend/experimentsStore.ts +++ b/tensorboard/components/tf_backend/experimentsStore.ts @@ -13,9 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as _ from 'lodash'; - -import {getRouter} from './router'; import {BaseStore} from './baseStore'; +import {getRouter} from './router'; import {Experiment} from './type'; export class ExperimentsStore extends BaseStore { diff --git a/tensorboard/components/tf_backend/runsStore.ts b/tensorboard/components/tf_backend/runsStore.ts index d20a5a3265..feaee04329 100644 --- a/tensorboard/components/tf_backend/runsStore.ts +++ b/tensorboard/components/tf_backend/runsStore.ts @@ -13,9 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as _ from 'lodash'; - -import {getRouter} from './router'; import {BaseStore} from './baseStore'; +import {getRouter} from './router'; export class RunsStore extends BaseStore { private _runs: string[] = []; diff --git a/tensorboard/components/tf_backend/tf-backend-polymer.ts b/tensorboard/components/tf_backend/tf-backend-polymer.ts index 95e1e3c80f..aefdc4465c 100644 --- a/tensorboard/components/tf_backend/tf-backend-polymer.ts +++ b/tensorboard/components/tf_backend/tf-backend-polymer.ts @@ -12,9 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement} from '@polymer/polymer'; import {customElement} from '@polymer/decorators'; - +import {PolymerElement} from '@polymer/polymer'; import * as tf_backend from './tf-backend'; // HACK: this Polymer component allows stores to be accessible from diff --git a/tensorboard/components/tf_card_heading/tf-card-heading.ts b/tensorboard/components/tf_card_heading/tf-card-heading.ts index e4f7b178ef..a12d5a8258 100644 --- a/tensorboard/components/tf_card_heading/tf-card-heading.ts +++ b/tensorboard/components/tf_card_heading/tf-card-heading.ts @@ -13,14 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {computed, customElement, property} from '@polymer/decorators'; - -import '../tf_markdown_view/tf-markdown-view'; +import {html, PolymerElement} from '@polymer/polymer'; import '../polymer/irons_and_papers'; - -import {pickTextColor} from './util'; +import '../tf_markdown_view/tf-markdown-view'; import './tf-card-heading-style'; +import {pickTextColor} from './util'; /** * A compact heading to appear above a single visualization, summarizing diff --git a/tensorboard/components/tf_categorization_utils/categorizationUtils.ts b/tensorboard/components/tf_categorization_utils/categorizationUtils.ts index bf2ae4acb8..3fd65ea1e8 100644 --- a/tensorboard/components/tf_categorization_utils/categorizationUtils.ts +++ b/tensorboard/components/tf_categorization_utils/categorizationUtils.ts @@ -19,8 +19,8 @@ limitations under the License. * `tf-category-paginated-view`. */ import * as _ from 'lodash'; -import {Experiment, Run} from '../tf_backend/type'; import {getTags} from '../tf_backend/backend'; +import {Experiment, Run} from '../tf_backend/type'; import {compareTagNames} from '../vz_sorting/sorting'; export type RunToTag = { diff --git a/tensorboard/components/tf_categorization_utils/tf-tag-filterer.ts b/tensorboard/components/tf_categorization_utils/tf-tag-filterer.ts index ebeaf61a5d..a7bfc6b215 100644 --- a/tensorboard/components/tf_categorization_utils/tf-tag-filterer.ts +++ b/tensorboard/components/tf_categorization_utils/tf-tag-filterer.ts @@ -13,9 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; - +import {html, PolymerElement} from '@polymer/polymer'; import '../polymer/irons_and_papers'; import {getStringInitializer, getStringObserver} from '../tf_storage/storage'; diff --git a/tensorboard/components/tf_color_scale/colorScale.ts b/tensorboard/components/tf_color_scale/colorScale.ts index 60c7dd242c..f92e6bfb9d 100644 --- a/tensorboard/components/tf_color_scale/colorScale.ts +++ b/tensorboard/components/tf_color_scale/colorScale.ts @@ -13,12 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as d3 from 'd3'; - -import {standard} from './palettes'; - import {BaseStore} from '../tf_backend/baseStore'; -import {runsStore} from '../tf_backend/runsStore'; import {experimentsStore} from '../tf_backend/experimentsStore'; +import {runsStore} from '../tf_backend/runsStore'; +import {standard} from './palettes'; // Example usage: // runs = ["train", "test", "test1", "test2"] diff --git a/tensorboard/components/tf_color_scale/tf-color-scale-polymer.ts b/tensorboard/components/tf_color_scale/tf-color-scale-polymer.ts index 8c5d428a9f..7952996dd1 100644 --- a/tensorboard/components/tf_color_scale/tf-color-scale-polymer.ts +++ b/tensorboard/components/tf_color_scale/tf-color-scale-polymer.ts @@ -12,9 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement} from '@polymer/polymer'; import {customElement} from '@polymer/decorators'; - +import {PolymerElement} from '@polymer/polymer'; import {runsColorScale} from './colorScale'; // HACK: this Polymer component allows stores to be accessible from diff --git a/tensorboard/components/tf_dashboard_common/dashboard-style.ts b/tensorboard/components/tf_dashboard_common/dashboard-style.ts index 0274513c3f..df0ac13420 100644 --- a/tensorboard/components/tf_dashboard_common/dashboard-style.ts +++ b/tensorboard/components/tf_dashboard_common/dashboard-style.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {registerStyleDomModule} from '../polymer/register_style_dom_module'; import '../polymer/irons_and_papers'; +import {registerStyleDomModule} from '../polymer/register_style_dom_module'; registerStyleDomModule({ moduleName: 'dashboard-style', diff --git a/tensorboard/components/tf_dashboard_common/data-loader-behavior.ts b/tensorboard/components/tf_dashboard_common/data-loader-behavior.ts index 7cac2df7ba..ef083f3ffa 100644 --- a/tensorboard/components/tf_dashboard_common/data-loader-behavior.ts +++ b/tensorboard/components/tf_dashboard_common/data-loader-behavior.ts @@ -14,9 +14,7 @@ limitations under the License. ==============================================================================*/ import {PolymerElement} from '@polymer/polymer'; import * as _ from 'lodash'; - -import {CancelResult, Canceller} from '../tf_backend/canceller'; -import {RequestManager} from '../tf_backend/requestManager'; +import {Canceller, CancelResult} from '../tf_backend/canceller'; type CacheKey = string; diff --git a/tensorboard/components/tf_dashboard_common/tf-dashboard-layout.ts b/tensorboard/components/tf_dashboard_common/tf-dashboard-layout.ts index 289b9f0c0a..51b5491c78 100644 --- a/tensorboard/components/tf_dashboard_common/tf-dashboard-layout.ts +++ b/tensorboard/components/tf_dashboard_common/tf-dashboard-layout.ts @@ -13,12 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement} from '@polymer/decorators'; - -import './tensorboard-color'; -import './scrollbar-style'; +import {html, PolymerElement} from '@polymer/polymer'; import {DarkModeMixin} from '../polymer/dark_mode_mixin'; +import './scrollbar-style'; +import './tensorboard-color'; @customElement('tf-dashboard-layout') class TfDashboardLayout extends DarkModeMixin(PolymerElement) { diff --git a/tensorboard/components/tf_dashboard_common/tf-downloader.ts b/tensorboard/components/tf_dashboard_common/tf-downloader.ts index 1732999e10..de727f440b 100644 --- a/tensorboard/components/tf_dashboard_common/tf-downloader.ts +++ b/tensorboard/components/tf_dashboard_common/tf-downloader.ts @@ -13,9 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; - +import {html, PolymerElement} from '@polymer/polymer'; import '../polymer/irons_and_papers'; import {addParams} from '../tf_backend/urlPathHelpers'; diff --git a/tensorboard/components/tf_dashboard_common/tf-dropdown-trigger.ts b/tensorboard/components/tf_dashboard_common/tf-dropdown-trigger.ts index f04db2b837..180a05eb8b 100644 --- a/tensorboard/components/tf_dashboard_common/tf-dropdown-trigger.ts +++ b/tensorboard/components/tf_dashboard_common/tf-dropdown-trigger.ts @@ -13,12 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; +import {customElement, observe, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; +import '../polymer/irons_and_papers'; import {LegacyElementMixin} from '../polymer/legacy_element_mixin'; -import {customElement, property, observe} from '@polymer/decorators'; - import {PaperInkyFocusBehavior} from '../polymer/paper_inky_focus_behavior'; -import '../polymer/irons_and_papers'; /** * tf-dropdown-trigger is a paper-menu-button trigger that has similar asthetics diff --git a/tensorboard/components/tf_dashboard_common/tf-filterable-checkbox-dropdown.ts b/tensorboard/components/tf_dashboard_common/tf-filterable-checkbox-dropdown.ts index e3f799b966..afc6513634 100644 --- a/tensorboard/components/tf_dashboard_common/tf-filterable-checkbox-dropdown.ts +++ b/tensorboard/components/tf_dashboard_common/tf-filterable-checkbox-dropdown.ts @@ -14,11 +14,9 @@ limitations under the License. ==============================================================================*/ import {computed, customElement, property} from '@polymer/decorators'; -import {PolymerElement, html} from '@polymer/polymer'; - -import {LegacyElementMixin} from '../polymer/legacy_element_mixin'; +import {html, PolymerElement} from '@polymer/polymer'; import '../polymer/irons_and_papers'; - +import {LegacyElementMixin} from '../polymer/legacy_element_mixin'; import './tf-dropdown-trigger'; import {FilterableCheckboxListItem} from './tf-filterable-checkbox-list'; diff --git a/tensorboard/components/tf_dashboard_common/tf-filterable-checkbox-list.ts b/tensorboard/components/tf_dashboard_common/tf-filterable-checkbox-list.ts index 06d05e45ab..e2075eb117 100644 --- a/tensorboard/components/tf_dashboard_common/tf-filterable-checkbox-list.ts +++ b/tensorboard/components/tf_dashboard_common/tf-filterable-checkbox-list.ts @@ -14,11 +14,9 @@ limitations under the License. ==============================================================================*/ import {computed, customElement, observe, property} from '@polymer/decorators'; -import {PolymerElement, html} from '@polymer/polymer'; - -import {LegacyElementMixin} from '../polymer/legacy_element_mixin'; +import {html, PolymerElement} from '@polymer/polymer'; import '../polymer/irons_and_papers'; - +import {LegacyElementMixin} from '../polymer/legacy_element_mixin'; import './run-color-style'; import './scrollbar-style'; diff --git a/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.ts b/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.ts index 8d55074818..8609589b9a 100644 --- a/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.ts +++ b/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.ts @@ -13,13 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; -import {computed, observe, customElement, property} from '@polymer/decorators'; -import {LegacyElementMixin} from '../polymer/legacy_element_mixin'; -import '../polymer/irons_and_papers'; - +import {computed, customElement, observe, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import * as _ from 'lodash'; - +import '../polymer/irons_and_papers'; +import {LegacyElementMixin} from '../polymer/legacy_element_mixin'; import './run-color-style'; import './scrollbar-style'; diff --git a/tensorboard/components/tf_dashboard_common/tf-no-data-warning.ts b/tensorboard/components/tf_dashboard_common/tf-no-data-warning.ts index 09b3cdcba8..518e92966c 100644 --- a/tensorboard/components/tf_dashboard_common/tf-no-data-warning.ts +++ b/tensorboard/components/tf_dashboard_common/tf-no-data-warning.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; @customElement('tf-no-data-warning') class TfNoDataWarning extends PolymerElement { diff --git a/tensorboard/components/tf_dashboard_common/tf-option-selector.ts b/tensorboard/components/tf_dashboard_common/tf-option-selector.ts index b20a686f70..34b32d7334 100644 --- a/tensorboard/components/tf_dashboard_common/tf-option-selector.ts +++ b/tensorboard/components/tf_dashboard_common/tf-option-selector.ts @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; -import {LegacyElementMixin} from '../polymer/legacy_element_mixin'; import {customElement, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; +import {LegacyElementMixin} from '../polymer/legacy_element_mixin'; import './tensorboard-color'; @customElement('tf-option-selector') diff --git a/tensorboard/components/tf_globals/globals-polymer.ts b/tensorboard/components/tf_globals/globals-polymer.ts index b95e5d53a5..093369ce3e 100644 --- a/tensorboard/components/tf_globals/globals-polymer.ts +++ b/tensorboard/components/tf_globals/globals-polymer.ts @@ -12,9 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement} from '@polymer/polymer'; import {customElement} from '@polymer/decorators'; - +import {PolymerElement} from '@polymer/polymer'; import * as tf_globals from './globals'; @customElement('tf-globals') diff --git a/tensorboard/components/tf_line_chart_data_loader/tf-line-chart-data-loader.ts b/tensorboard/components/tf_line_chart_data_loader/tf-line-chart-data-loader.ts index d9d73ae5b0..96569ec9d9 100644 --- a/tensorboard/components/tf_line_chart_data_loader/tf-line-chart-data-loader.ts +++ b/tensorboard/components/tf_line_chart_data_loader/tf-line-chart-data-loader.ts @@ -12,24 +12,23 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; -import * as Plottable from 'plottable'; -import {customElement, property, observe} from '@polymer/decorators'; +import {customElement, observe, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import * as _ from 'lodash'; - +import * as Plottable from 'plottable'; import '../polymer/irons_and_papers'; import {LegacyElementMixin} from '../polymer/legacy_element_mixin'; -import {runsColorScale} from '../tf_color_scale/colorScale'; import {RequestManager} from '../tf_backend/requestManager'; +import {runsColorScale} from '../tf_color_scale/colorScale'; +import {DataLoaderBehavior} from '../tf_dashboard_common/data-loader-behavior'; import { - XType, - TooltipColumn, - SymbolFn, ScalarDatum, + SymbolFn, + TooltipColumn, + XType, } from '../vz_chart_helpers/vz-chart-helpers'; -import {DataLoaderBehavior} from '../tf_dashboard_common/data-loader-behavior'; +import {FillArea, YScaleType} from '../vz_line_chart2/line-chart'; import '../vz_line_chart2/vz-line-chart2'; -import {YScaleType, FillArea} from '../vz_line_chart2/line-chart'; export interface TfLineChartDataLoader extends HTMLElement { commitChanges(): void; diff --git a/tensorboard/components/tf_markdown_view/tf-markdown-view.ts b/tensorboard/components/tf_markdown_view/tf-markdown-view.ts index f9fa6b8f37..522f373659 100644 --- a/tensorboard/components/tf_markdown_view/tf-markdown-view.ts +++ b/tensorboard/components/tf_markdown_view/tf-markdown-view.ts @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; -import {LegacyElementMixin} from '../polymer/legacy_element_mixin'; import {computed, customElement, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; +import {LegacyElementMixin} from '../polymer/legacy_element_mixin'; import {sanitize} from './sanitize'; // tf-markdown-view renders raw HTML that has been converted from diff --git a/tensorboard/components/tf_paginated_view/tf-category-paginated-view.ts b/tensorboard/components/tf_paginated_view/tf-category-paginated-view.ts index 7dc43a8bf6..dbe184a052 100644 --- a/tensorboard/components/tf_paginated_view/tf-category-paginated-view.ts +++ b/tensorboard/components/tf_paginated_view/tf-category-paginated-view.ts @@ -13,9 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +import {computed, customElement, observe, property} from '@polymer/decorators'; import {html} from '@polymer/polymer'; -import {customElement, property, observe, computed} from '@polymer/decorators'; - import '../polymer/irons_and_papers'; import { Category, @@ -23,8 +22,8 @@ import { } from '../tf_categorization_utils/categorizationUtils'; import { addLimitListener, - removeLimitListener, getLimit, + removeLimitListener, } from './paginatedViewStore'; import {TfDomRepeat} from './tf-dom-repeat'; diff --git a/tensorboard/components/tf_paginated_view/tf-dom-repeat.ts b/tensorboard/components/tf_paginated_view/tf-dom-repeat.ts index 3616236abc..5f2ec867ad 100644 --- a/tensorboard/components/tf_paginated_view/tf-dom-repeat.ts +++ b/tensorboard/components/tf_paginated_view/tf-dom-repeat.ts @@ -12,12 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +import {observe, property} from '@polymer/decorators'; import { - templatize, TemplateInstanceBase, + templatize, } from '@polymer/polymer/lib/utils/templatize'; -import {property, observe} from '@polymer/decorators'; - import {ArrayUpdateHelper} from '../tf_dashboard_common/array-update-helper'; /** diff --git a/tensorboard/components/tf_paginated_view/tf-paginated-view-store.ts b/tensorboard/components/tf_paginated_view/tf-paginated-view-store.ts index c02cfc5161..98b7ffd979 100644 --- a/tensorboard/components/tf_paginated_view/tf-paginated-view-store.ts +++ b/tensorboard/components/tf_paginated_view/tf-paginated-view-store.ts @@ -13,9 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement} from '@polymer/polymer'; import {customElement} from '@polymer/decorators'; - +import {PolymerElement} from '@polymer/polymer'; import * as tf_paginated_view from './index'; @customElement('tf-paginated-view-store') diff --git a/tensorboard/components/tf_runs_selector/tf-runs-selector.ts b/tensorboard/components/tf_runs_selector/tf-runs-selector.ts index f9bed36120..f355b0a5aa 100644 --- a/tensorboard/components/tf_runs_selector/tf-runs-selector.ts +++ b/tensorboard/components/tf_runs_selector/tf-runs-selector.ts @@ -13,18 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {computed, customElement, property} from '@polymer/decorators'; - -import {LegacyElementMixin} from '../polymer/legacy_element_mixin'; +import {html, PolymerElement} from '@polymer/polymer'; import '../polymer/irons_and_papers'; +import {LegacyElementMixin} from '../polymer/legacy_element_mixin'; import * as baseStore from '../tf_backend/baseStore'; import {environmentStore} from '../tf_backend/environmentStore'; import {runsStore} from '../tf_backend/runsStore'; import {runsColorScale} from '../tf_color_scale/colorScale'; -import * as storage from '../tf_storage/storage'; - import '../tf_dashboard_common/tf-multi-checkbox'; +import * as storage from '../tf_storage/storage'; import '../tf_wbr_string/tf-wbr-string'; @customElement('tf-runs-selector') diff --git a/tensorboard/components/tf_storage/storage.ts b/tensorboard/components/tf_storage/storage.ts index 97c3ee52bb..9570c04744 100644 --- a/tensorboard/components/tf_storage/storage.ts +++ b/tensorboard/components/tf_storage/storage.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as _ from 'lodash'; - import { addHashListener, addStorageListener, diff --git a/tensorboard/components/tf_storage/tf-storage-polymer.ts b/tensorboard/components/tf_storage/tf-storage-polymer.ts index 6c84bf0d0b..d21722e812 100644 --- a/tensorboard/components/tf_storage/tf-storage-polymer.ts +++ b/tensorboard/components/tf_storage/tf-storage-polymer.ts @@ -12,9 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement} from '@polymer/polymer'; import {customElement} from '@polymer/decorators'; - +import {PolymerElement} from '@polymer/polymer'; import * as tf_storage from './index'; @customElement('tf-storage') diff --git a/tensorboard/components/tf_wbr_string/tf-wbr-string.ts b/tensorboard/components/tf_wbr_string/tf-wbr-string.ts index 80b5b51953..401ea8cd4e 100644 --- a/tensorboard/components/tf_wbr_string/tf-wbr-string.ts +++ b/tensorboard/components/tf_wbr_string/tf-wbr-string.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; -import {customElement, property, computed} from '@polymer/decorators'; +import {computed, customElement, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; // tf-wbr-string safely renders a string, with word break elements inserted // after substrings that match a regular expression pattern. diff --git a/tensorboard/components/vz_chart_helpers/vz-chart-helpers.ts b/tensorboard/components/vz_chart_helpers/vz-chart-helpers.ts index 49e16ba9a7..264269cb6f 100644 --- a/tensorboard/components/vz_chart_helpers/vz-chart-helpers.ts +++ b/tensorboard/components/vz_chart_helpers/vz-chart-helpers.ts @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import * as Plottable from 'plottable'; -import * as _ from 'lodash'; import * as d3 from 'd3'; +import * as _ from 'lodash'; +import * as Plottable from 'plottable'; export interface Datum { wall_time: Date; diff --git a/tensorboard/components/vz_chart_helpers/vz-chart-tooltip.ts b/tensorboard/components/vz_chart_helpers/vz-chart-tooltip.ts index df6c344767..a22631db48 100644 --- a/tensorboard/components/vz_chart_helpers/vz-chart-tooltip.ts +++ b/tensorboard/components/vz_chart_helpers/vz-chart-tooltip.ts @@ -12,11 +12,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement} from '@polymer/polymer'; -import {LegacyElementMixin} from '../polymer/legacy_element_mixin'; import {customElement, property} from '@polymer/decorators'; +import {PolymerElement} from '@polymer/polymer'; import * as _ from 'lodash'; - +import {LegacyElementMixin} from '../polymer/legacy_element_mixin'; import {TOOLTIP_Y_PIXEL_OFFSET} from './vz-chart-helpers'; export enum TooltipPosition { diff --git a/tensorboard/components/vz_line_chart2/line-chart.ts b/tensorboard/components/vz_line_chart2/line-chart.ts index 47bcd22c0d..262f0fa123 100644 --- a/tensorboard/components/vz_line_chart2/line-chart.ts +++ b/tensorboard/components/vz_line_chart2/line-chart.ts @@ -13,22 +13,20 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as d3 from 'd3'; -import * as Plottable from 'plottable'; import * as _ from 'lodash'; - +import * as Plottable from 'plottable'; import {PointerInteraction} from '../vz_chart_helpers/plottable-interactions'; import * as vz_chart_helpers from '../vz_chart_helpers/vz-chart-helpers'; import { SymbolFn, - XComponents, TooltipColumn, + XComponents, } from '../vz_chart_helpers/vz-chart-helpers'; import '../vz_chart_helpers/vz-chart-tooltip'; - import {LinearScale} from './linear-scale'; import {LogScale} from './log-scale'; -import {ITfScale} from './tf-scale'; import {PanZoomDragLayer} from './panZoomDragLayer'; +import {ITfScale} from './tf-scale'; /** * An interface that describes a fill area to visualize. The fill area is diff --git a/tensorboard/components/vz_line_chart2/linear-scale.ts b/tensorboard/components/vz_line_chart2/linear-scale.ts index 5992facb3c..508c485a8d 100644 --- a/tensorboard/components/vz_line_chart2/linear-scale.ts +++ b/tensorboard/components/vz_line_chart2/linear-scale.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import * as d3 from 'd3'; import * as Plottable from 'plottable'; - import { createScale, ScaleType, diff --git a/tensorboard/components/vz_line_chart2/log-scale.ts b/tensorboard/components/vz_line_chart2/log-scale.ts index c03532c8d9..349a2b6efd 100644 --- a/tensorboard/components/vz_line_chart2/log-scale.ts +++ b/tensorboard/components/vz_line_chart2/log-scale.ts @@ -12,9 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import * as Plottable from 'plottable'; import * as d3 from 'd3'; - +import * as Plottable from 'plottable'; import {TfScale} from './tf-scale'; // Smallest positive non-zero value represented by IEEE 754 binary (64 bit) import * as d3 from 'd3'; diff --git a/tensorboard/components/vz_line_chart2/microbenchmark/main.ts b/tensorboard/components/vz_line_chart2/microbenchmark/main.ts index f8394804b4..bd8e029799 100644 --- a/tensorboard/components/vz_line_chart2/microbenchmark/main.ts +++ b/tensorboard/components/vz_line_chart2/microbenchmark/main.ts @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {getBenchmarks} from './spec.js'; +import {consoleReporter} from './reporter.js'; import {runner} from './runner.js'; -import {htmlTableReporter, consoleReporter} from './reporter.js'; +import {getBenchmarks} from './spec.js'; (window as any).requestIdleCallback(async () => { const results = await runner(getBenchmarks()); diff --git a/tensorboard/components/vz_line_chart2/microbenchmark/renders_spec.ts b/tensorboard/components/vz_line_chart2/microbenchmark/renders_spec.ts index f3359876b2..5bc15d1d54 100644 --- a/tensorboard/components/vz_line_chart2/microbenchmark/renders_spec.ts +++ b/tensorboard/components/vz_line_chart2/microbenchmark/renders_spec.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {benchmark, Size} from './spec.js'; import {polymerFlush} from './polymer_util.js'; +import {benchmark, Size} from './spec.js'; function createScalarPoint(index: number, scalarValue: number) { return { diff --git a/tensorboard/components/vz_line_chart2/microbenchmark/runner.ts b/tensorboard/components/vz_line_chart2/microbenchmark/runner.ts index 873d582efa..d753f66639 100644 --- a/tensorboard/components/vz_line_chart2/microbenchmark/runner.ts +++ b/tensorboard/components/vz_line_chart2/microbenchmark/runner.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {patchAsync, flushAsync, setTimeoutP} from './async.js'; -import {Benchmark, Size, Result} from './types.js'; +import {flushAsync, patchAsync, setTimeoutP} from './async.js'; +import {Benchmark, Result, Size} from './types.js'; export async function runner(benchmarks: Benchmark[]): Promise { const results: Result[] = []; diff --git a/tensorboard/components/vz_line_chart2/panZoomDragLayer.ts b/tensorboard/components/vz_line_chart2/panZoomDragLayer.ts index 0517776913..553300c81c 100644 --- a/tensorboard/components/vz_line_chart2/panZoomDragLayer.ts +++ b/tensorboard/components/vz_line_chart2/panZoomDragLayer.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as Plottable from 'plottable'; - import {DragZoomLayer} from './dragZoomInteraction'; enum State { diff --git a/tensorboard/components/vz_line_chart2/vz-line-chart2.ts b/tensorboard/components/vz_line_chart2/vz-line-chart2.ts index 23974c1a11..99e32ce3d7 100644 --- a/tensorboard/components/vz_line_chart2/vz-line-chart2.ts +++ b/tensorboard/components/vz_line_chart2/vz-line-chart2.ts @@ -12,20 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; -import {LegacyElementMixin} from '../polymer/legacy_element_mixin'; import {customElement, observe, property} from '@polymer/decorators'; -import * as _ from 'lodash'; +import {html, PolymerElement} from '@polymer/polymer'; import * as d3 from 'd3'; +import * as _ from 'lodash'; import * as Plottable from 'plottable'; +import {LegacyElementMixin} from '../polymer/legacy_element_mixin'; import '../polymer/plottable-style'; - -import {LineChart, LineChartStatus} from './line-chart'; -import {LineChartExporter} from './line-chart-exporter'; -import {PanZoomDragLayer} from './panZoomDragLayer'; -// imports the style definition. -import './panZoomDragLayer.html'; - import { getXComponents, multiscaleFormatter, @@ -42,7 +35,11 @@ import { Y_TOOLTIP_FORMATTER_PRECISION, } from '../vz_chart_helpers/vz-chart-helpers'; import {TooltipPosition} from '../vz_chart_helpers/vz-chart-tooltip'; -import {YScaleType, FillArea} from './line-chart'; +import {FillArea, LineChart, LineChartStatus, YScaleType} from './line-chart'; +import {LineChartExporter} from './line-chart-exporter'; +import {PanZoomDragLayer} from './panZoomDragLayer'; +// imports the style definition. +import './panZoomDragLayer.html'; const valueFormatter = multiscaleFormatter(Y_TOOLTIP_FORMATTER_PRECISION); diff --git a/tensorboard/plugins/audio/tf_audio_dashboard/tf-audio-dashboard.ts b/tensorboard/plugins/audio/tf_audio_dashboard/tf-audio-dashboard.ts index af627d1d6c..cf1159a61c 100644 --- a/tensorboard/plugins/audio/tf_audio_dashboard/tf-audio-dashboard.ts +++ b/tensorboard/plugins/audio/tf_audio_dashboard/tf-audio-dashboard.ts @@ -14,9 +14,8 @@ limitations under the License. ==============================================================================*/ import {computed, customElement, property} from '@polymer/decorators'; -import {PolymerElement, html} from '@polymer/polymer'; +import {html, PolymerElement} from '@polymer/polymer'; import * as _ from 'lodash'; - import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import {getTags} from '../../../components/tf_backend/backend'; import {RequestManager} from '../../../components/tf_backend/requestManager'; @@ -27,8 +26,8 @@ import '../../../components/tf_dashboard_common/dashboard-style'; import '../../../components/tf_dashboard_common/tf-dashboard-layout'; import '../../../components/tf_paginated_view/tf-category-paginated-view'; import '../../../components/tf_runs_selector/tf-runs-selector'; -import {AudioTagInfo, TfAudioLoader} from './tf-audio-loader'; import './tf-audio-loader'; +import {AudioTagInfo, TfAudioLoader} from './tf-audio-loader'; /* tf-audio-dashboard displays a dashboard that loads audio from a TensorFlow run. diff --git a/tensorboard/plugins/audio/tf_audio_dashboard/tf-audio-loader.ts b/tensorboard/plugins/audio/tf_audio_dashboard/tf-audio-loader.ts index 0733a6ae06..ec66c219b3 100644 --- a/tensorboard/plugins/audio/tf_audio_dashboard/tf-audio-loader.ts +++ b/tensorboard/plugins/audio/tf_audio_dashboard/tf-audio-loader.ts @@ -14,11 +14,9 @@ limitations under the License. ==============================================================================*/ import {computed, customElement, observe, property} from '@polymer/decorators'; -import {PolymerElement, html} from '@polymer/polymer'; -import * as _ from 'lodash'; - -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import {html, PolymerElement} from '@polymer/polymer'; import '../../../components/polymer/irons_and_papers'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import {Canceller} from '../../../components/tf_backend/canceller'; import {RequestManager} from '../../../components/tf_backend/requestManager'; import {getRouter} from '../../../components/tf_backend/router'; diff --git a/tensorboard/plugins/custom_scalar/tf_custom_scalar_dashboard/tf-custom-scalar-dashboard.ts b/tensorboard/plugins/custom_scalar/tf_custom_scalar_dashboard/tf-custom-scalar-dashboard.ts index 47fbf5be96..cfcdcabd9b 100644 --- a/tensorboard/plugins/custom_scalar/tf_custom_scalar_dashboard/tf-custom-scalar-dashboard.ts +++ b/tensorboard/plugins/custom_scalar/tf_custom_scalar_dashboard/tf-custom-scalar-dashboard.ts @@ -13,9 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; -import {computed, customElement, observe, property} from '@polymer/decorators'; - +import {computed, customElement, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import {Canceller} from '../../../components/tf_backend/canceller'; import {RequestManager} from '../../../components/tf_backend/requestManager'; import {getRouter} from '../../../components/tf_backend/router'; @@ -36,7 +35,6 @@ import { } from '../../../components/tf_storage/storage'; import '../../../components/tf_utils/utils'; import '../../scalar/tf_scalar_dashboard/tf-smoothing-input'; - import {Layout} from './tf-custom-scalar-helpers'; import './tf-custom-scalar-margin-chart-card'; import {TfCustomScalarMarginChartCard} from './tf-custom-scalar-margin-chart-card'; diff --git a/tensorboard/plugins/custom_scalar/tf_custom_scalar_dashboard/tf-custom-scalar-helpers.ts b/tensorboard/plugins/custom_scalar/tf_custom_scalar_dashboard/tf-custom-scalar-helpers.ts index 2795971c7a..be6fec295f 100644 --- a/tensorboard/plugins/custom_scalar/tf_custom_scalar_dashboard/tf-custom-scalar-helpers.ts +++ b/tensorboard/plugins/custom_scalar/tf_custom_scalar_dashboard/tf-custom-scalar-helpers.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import * as Plottable from 'plottable'; - import { LineChartSymbol, ScalarDatum, diff --git a/tensorboard/plugins/custom_scalar/tf_custom_scalar_dashboard/tf-custom-scalar-margin-chart-card.ts b/tensorboard/plugins/custom_scalar/tf_custom_scalar_dashboard/tf-custom-scalar-margin-chart-card.ts index 823024e922..706a1aa21b 100644 --- a/tensorboard/plugins/custom_scalar/tf_custom_scalar_dashboard/tf-custom-scalar-margin-chart-card.ts +++ b/tensorboard/plugins/custom_scalar/tf_custom_scalar_dashboard/tf-custom-scalar-margin-chart-card.ts @@ -14,9 +14,8 @@ limitations under the License. ==============================================================================*/ import {computed, customElement, observe, property} from '@polymer/decorators'; -import {PolymerElement, html} from '@polymer/polymer'; +import {html, PolymerElement} from '@polymer/polymer'; import * as _ from 'lodash'; - import {DomRepeat} from '../../../components/polymer/dom-repeat'; import '../../../components/polymer/irons_and_papers'; import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; @@ -24,21 +23,20 @@ import {RequestManager} from '../../../components/tf_backend/requestManager'; import {getRouter} from '../../../components/tf_backend/router'; import {addParams} from '../../../components/tf_backend/urlPathHelpers'; import '../../../components/tf_card_heading/tf-card-heading'; -import {RequestDataCallback} from '../../../components/tf_dashboard_common/data-loader-behavior'; import {runsColorScale} from '../../../components/tf_color_scale/colorScale'; +import {RequestDataCallback} from '../../../components/tf_dashboard_common/data-loader-behavior'; import '../../../components/tf_line_chart_data_loader/tf-line-chart-data-loader'; import {TfLineChartDataLoader} from '../../../components/tf_line_chart_data_loader/tf-line-chart-data-loader'; import { - SYMBOLS_LIST, - ScalarDatum, - Y_TOOLTIP_FORMATTER_PRECISION, multiscaleFormatter, relativeAccessor, relativeFormatter, + ScalarDatum, stepFormatter, + SYMBOLS_LIST, timeFormatter, + Y_TOOLTIP_FORMATTER_PRECISION, } from '../../../components/vz_chart_helpers/vz-chart-helpers'; - import './tf-custom-scalar-card-style'; import { DataSeries, diff --git a/tensorboard/plugins/custom_scalar/tf_custom_scalar_dashboard/tf-custom-scalar-multi-line-chart-card.ts b/tensorboard/plugins/custom_scalar/tf_custom_scalar_dashboard/tf-custom-scalar-multi-line-chart-card.ts index 4118d1ab97..1c1c096d1f 100644 --- a/tensorboard/plugins/custom_scalar/tf_custom_scalar_dashboard/tf-custom-scalar-multi-line-chart-card.ts +++ b/tensorboard/plugins/custom_scalar/tf_custom_scalar_dashboard/tf-custom-scalar-multi-line-chart-card.ts @@ -14,9 +14,8 @@ limitations under the License. ==============================================================================*/ import {computed, customElement, observe, property} from '@polymer/decorators'; -import {PolymerElement, html} from '@polymer/polymer'; +import {html, PolymerElement} from '@polymer/polymer'; import * as _ from 'lodash'; - import {DomRepeat} from '../../../components/polymer/dom-repeat'; import '../../../components/polymer/irons_and_papers'; import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; @@ -25,13 +24,13 @@ import {getRouter} from '../../../components/tf_backend/router'; import '../../../components/tf_backend/tf-backend'; import {addParams} from '../../../components/tf_backend/urlPathHelpers'; import '../../../components/tf_card_heading/tf-card-heading'; -import {RequestDataCallback} from '../../../components/tf_dashboard_common/data-loader-behavior'; import {runsColorScale} from '../../../components/tf_color_scale/colorScale'; +import {RequestDataCallback} from '../../../components/tf_dashboard_common/data-loader-behavior'; import '../../../components/tf_line_chart_data_loader/tf-line-chart-data-loader'; import {TfLineChartDataLoader} from '../../../components/tf_line_chart_data_loader/tf-line-chart-data-loader'; import { - SYMBOLS_LIST, ScalarDatum, + SYMBOLS_LIST, } from '../../../components/vz_chart_helpers/vz-chart-helpers'; import './tf-custom-scalar-card-style'; import { diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/actions/debugger_actions.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/actions/debugger_actions.ts index a50e810f2f..e83e8b1934 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/actions/debugger_actions.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/actions/debugger_actions.ts @@ -14,7 +14,12 @@ limitations under the License. ==============================================================================*/ import {createAction, props} from '@ngrx/store'; - +import { + ExecutionDataResponse, + ExecutionDigestsResponse, + GraphExecutionDataResponse, + SourceFileResponse, +} from '../data_source/tfdbg2_data_source'; import { Alert, AlertsBreakdown, @@ -25,12 +30,6 @@ import { StackFrame, StackFramesById, } from '../store/debugger_types'; -import { - ExecutionDigestsResponse, - ExecutionDataResponse, - GraphExecutionDataResponse, - SourceFileResponse, -} from '../data_source/tfdbg2_data_source'; /** * Actions for Debugger V2. diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/data_source/tfdbg2_data_source.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/data_source/tfdbg2_data_source.ts index 0cdc5ed427..18dfbf47ac 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/data_source/tfdbg2_data_source.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/data_source/tfdbg2_data_source.ts @@ -15,6 +15,7 @@ limitations under the License. import {Injectable} from '@angular/core'; import {Observable} from 'rxjs'; import {map} from 'rxjs/operators'; +import {TBHttpClient} from '../../../../webapp/webapp_data_source/tb_http_client'; import { Alert, DebuggerRunListing, @@ -27,7 +28,6 @@ import { StackFrame, StackFrameAsArray, } from '../store/debugger_types'; -import {TBHttpClient} from '../../../../webapp/webapp_data_source/tb_http_client'; // The backend route for source-file list responds with an array // of 2-tuples: . diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/data_source/tfdbg2_data_source_module.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/data_source/tfdbg2_data_source_module.ts index 4deb41ab95..b8d9980c37 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/data_source/tfdbg2_data_source_module.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/data_source/tfdbg2_data_source_module.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; -import {Tfdbg2HttpServerDataSource} from './tfdbg2_data_source'; import {TBHttpClientModule} from '../../../../webapp/webapp_data_source/tb_http_client_module'; +import {Tfdbg2HttpServerDataSource} from './tfdbg2_data_source'; @NgModule({ imports: [TBHttpClientModule], providers: [Tfdbg2HttpServerDataSource], diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/debugger_container.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/debugger_container.ts index 7bfed5a131..ac03294a65 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/debugger_container.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/debugger_container.ts @@ -14,10 +14,9 @@ limitations under the License. ==============================================================================*/ import {Component, OnDestroy, OnInit} from '@angular/core'; import {createSelector, select, Store} from '@ngrx/store'; -import {State} from './store/debugger_types'; - import {debuggerLoaded, debuggerUnloaded} from './actions'; import {getActiveRunId, getDebuggerRunListing} from './store'; +import {State} from './store/debugger_types'; @Component({ selector: 'tf-debugger-v2', diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/debugger_container_test.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/debugger_container_test.ts index 1f2959a9c8..1e46690b92 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/debugger_container_test.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/debugger_container_test.ts @@ -20,7 +20,6 @@ import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; import {Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; - import {debuggerLoaded} from './actions'; import {DebuggerComponent} from './debugger_component'; import {DebuggerContainer} from './debugger_container'; diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/debugger_module.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/debugger_module.ts index bc655545b1..f719f3fd8a 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/debugger_module.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/debugger_module.ts @@ -17,7 +17,6 @@ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {EffectsModule} from '@ngrx/effects'; import {StoreModule} from '@ngrx/store'; - import {CoreModule} from '../../../webapp/core/core_module'; import {PluginRegistryModule} from '../../../webapp/plugins/plugin_registry_module'; import {Tfdbg2ServerDataSourceModule} from './data_source/tfdbg2_data_source_module'; diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/effects/debugger_effects.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/effects/debugger_effects.ts index efa10f4bd3..23ba4e59f4 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/effects/debugger_effects.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/effects/debugger_effects.ts @@ -29,7 +29,6 @@ import { tap, withLatestFrom, } from 'rxjs/operators'; - import {State as AppState} from '../../../../webapp/app_state'; import { changePlugin, diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/effects/debugger_effects_test.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/effects/debugger_effects_test.ts index 16595e2d48..68fdf11149 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/effects/debugger_effects_test.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/effects/debugger_effects_test.ts @@ -23,6 +23,8 @@ import { manualReload, reload, } from '../../../../webapp/core/actions'; +import {getActivePlugin} from '../../../../webapp/core/store'; +import {TBHttpClientTestingModule} from '../../../../webapp/webapp_data_source/tb_http_client_testing'; import { alertsOfTypeLoaded, alertTypeFocusToggled, @@ -38,25 +40,25 @@ import { executionScrollLeft, executionScrollRight, executionScrollToIndex, - graphExecutionDataRequested, graphExecutionDataLoaded, + graphExecutionDataRequested, graphExecutionFocused, graphExecutionScrollToIndex, graphOpFocused, graphOpInfoLoaded, graphOpInfoRequested, - numAlertsAndBreakdownRequested, numAlertsAndBreakdownLoaded, + numAlertsAndBreakdownRequested, numExecutionsLoaded, numExecutionsRequested, numGraphExecutionsLoaded, numGraphExecutionsRequested, sourceFileListLoaded, sourceFileListRequested, - stackFramesLoaded, - sourceLineFocused, sourceFileLoaded, sourceFileRequested, + sourceLineFocused, + stackFramesLoaded, } from '../actions'; import { AlertsResponse, @@ -72,29 +74,29 @@ import { import { getActiveRunId, getAlertsFocusType, + getAlertsLoaded, getDebuggerRunListing, - getFocusedSourceFileContent, - getFocusedSourceFileIndex, - getNumAlertsOfFocusedType, - getNumExecutionsLoaded, - getNumExecutions, - getNumGraphExecutions, + getDebuggerRunsLoaded, getDisplayCount, getExecutionDigestsLoaded, getExecutionPageSize, getExecutionScrollBeginIndex, - getGraphExecutionDisplayCount, + getFocusedSourceFileContent, + getFocusedSourceFileIndex, getGraphExecutionDataLoadingPages, getGraphExecutionDataPageLoadedSizes, + getGraphExecutionDisplayCount, getGraphExecutionPageSize, getGraphExecutionScrollBeginIndex, getLoadedAlertsOfFocusedType, - getLoadingGraphOps, getLoadedExecutionData, getLoadedStackFrames, - getAlertsLoaded, + getLoadingGraphOps, + getNumAlertsOfFocusedType, + getNumExecutions, + getNumExecutionsLoaded, + getNumGraphExecutions, getSourceFileList, - getDebuggerRunsLoaded, } from '../store'; import { AlertType, @@ -104,9 +106,9 @@ import { ExecutionDigest, GraphExecution, GraphOpInfo, - State, - SourceFileSpec, SourceFileContent, + SourceFileSpec, + State, } from '../store/debugger_types'; import { createDebuggerState, @@ -118,7 +120,7 @@ import { createTestInfNanAlert, createTestStackFrame, } from '../testing'; -import {TBHttpClientTestingModule} from '../../../../webapp/webapp_data_source/tb_http_client_testing'; +import {PLUGIN_ID} from '../types'; import { DebuggerEffects, getCurrentPollingInterval, @@ -127,8 +129,6 @@ import { POLLING_BACKOFF_FACTOR, TEST_ONLY, } from './debugger_effects'; -import {getActivePlugin} from '../../../../webapp/core/store'; -import {PLUGIN_ID} from '../types'; describe('getCurrentPollingInterval', () => { it('constants are valid', () => { diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_graphs_reducers_test.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_graphs_reducers_test.ts index 897e9e2c9d..04bf806ed4 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_graphs_reducers_test.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_graphs_reducers_test.ts @@ -13,16 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as actions from '../actions'; -import {reducers} from './debugger_reducers'; -import {CodeLocationType, DataLoadState} from './debugger_types'; import { + createDebuggerGraphExecutionsState, createDebuggerGraphsState, createDebuggerSourceCodeState, createDebuggerState, createTestGraphOpInfo, createTestStackFrame, - createDebuggerGraphExecutionsState, } from '../testing'; +import {reducers} from './debugger_reducers'; +import {CodeLocationType, DataLoadState} from './debugger_types'; describe('Debugger reducers', () => { describe('graphOpFocused', () => { diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_reducers.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_reducers.ts index 188c64aa57..62911458a8 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_reducers.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_reducers.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Action, createReducer, on} from '@ngrx/store'; - import * as actions from '../actions'; import { ExecutionDataResponse, @@ -24,8 +23,8 @@ import { import {getFocusedStackFramesHelper} from './debugger_store_helpers'; import { computeBottommostLineSpec, - findFileIndex, findBeginEndRangeIndex, + findFileIndex, isFrameBottommostInStackTrace, } from './debugger_store_utils'; import { @@ -35,12 +34,12 @@ import { DataLoadState, DebuggerState, Executions, - Graphs, GraphExecutions, + Graphs, InfNanAlert, - StackFramesById, SourceFileSpec, StackFrame, + StackFramesById, } from './debugger_types'; const DEFAULT_EXECUTION_PAGE_SIZE = 100; diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_reducers_test.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_reducers_test.ts index 4bb408f87f..1c7bd633c0 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_reducers_test.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_reducers_test.ts @@ -15,15 +15,6 @@ limitations under the License. import {deepFreeze} from '../../../../webapp/testing/lang'; import * as actions from '../actions'; import {ExecutionDigestsResponse} from '../data_source/tfdbg2_data_source'; -import {reducers} from './debugger_reducers'; -import { - Alert, - AlertType, - CodeLocationType, - DataLoadState, - Execution, - StackFramesById, -} from './debugger_types'; import { createAlertsState, createDebuggerExecutionsState, @@ -34,9 +25,18 @@ import { createDigestsStateWhileLoadingExecutionDigests, createTestExecutionData, createTestGraphExecution, - createTestStackFrame, createTestInfNanAlert, + createTestStackFrame, } from '../testing'; +import {reducers} from './debugger_reducers'; +import { + Alert, + AlertType, + CodeLocationType, + DataLoadState, + Execution, + StackFramesById, +} from './debugger_types'; describe('Debugger graphs reducers', () => { describe('alertTypeFocusToggled', () => { diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_selectors.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_selectors.ts index e58a0ecaa3..2567694f8a 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_selectors.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_selectors.ts @@ -13,21 +13,21 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {createSelector, createFeatureSelector} from '@ngrx/store'; +import {createFeatureSelector, createSelector} from '@ngrx/store'; import {getFocusedStackFramesHelper} from './debugger_store_helpers'; import {findFileIndex} from './debugger_store_utils'; import { + Alerts, AlertsBreakdown, AlertsByIndex, - Alerts, AlertType, CodeLocationExecutionOrigin, CodeLocationGraphOpCreationOrigin, CodeLocationType, DataLoadState, - DEBUGGER_FEATURE_KEY, DebuggerRunListing, DebuggerState, + DEBUGGER_FEATURE_KEY, Execution, ExecutionDigest, ExecutionDigestLoadState, diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_selectors_test.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_selectors_test.ts index d597549b78..cf478eb521 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_selectors_test.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_selectors_test.ts @@ -13,20 +13,37 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +import { + createAlertsState, + createDebuggerExecutionsState, + createDebuggerGraphExecutionsState, + createDebuggerGraphsState, + createDebuggerSourceCodeState, + createDebuggerState, + createState, + createTestExecutionData, + createTestExecutionDigest, + createTestGraphExecution, + createTestGraphOpInfo, + createTestInfNanAlert, + createTestStackFrame, +} from '../testing'; import { getAlertsBreakdown, getAlertsFocusType, getAlertsLoaded, getCodeLocationOrigin, + getFocusAlertTypesOfVisibleExecutionDigests, getFocusedExecutionData, getFocusedExecutionIndex, - getFocusedStackFrames, + getFocusedGraphExecutionInputIndices, getFocusedGraphOpConsumers, getFocusedGraphOpInfo, getFocusedGraphOpInputs, getFocusedSourceFileContent, getFocusedSourceFileIndex, getFocusedSourceLineSpec, + getFocusedStackFrames, getGraphExecutionData, getGraphExecutionDataLoadingPages, getGraphExecutionDataPageLoadedSizes, @@ -40,11 +57,9 @@ import { getNumAlertsOfFocusedType, getNumGraphExecutions, getNumGraphExecutionsLoaded, - getFocusAlertTypesOfVisibleExecutionDigests, getPollSilenceTimeMs, getSourceFileList, getSourceFileListLoaded, - getFocusedGraphExecutionInputIndices, } from './debugger_selectors'; import { AlertType, @@ -53,21 +68,6 @@ import { DEBUGGER_FEATURE_KEY, StackFrame, } from './debugger_types'; -import { - createAlertsState, - createDebuggerExecutionsState, - createDebuggerGraphExecutionsState, - createDebuggerGraphsState, - createDebuggerSourceCodeState, - createDebuggerState, - createState, - createTestExecutionData, - createTestExecutionDigest, - createTestGraphExecution, - createTestInfNanAlert, - createTestGraphOpInfo, - createTestStackFrame, -} from '../testing'; describe('debugger selectors', () => { describe('getPollSilenceTimeMs', () => { diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_store_utils.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_store_utils.ts index e2610b96d6..31569eb189 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_store_utils.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/debugger_store_utils.ts @@ -17,13 +17,7 @@ limitations under the License. */ import {getFocusedStackFramesHelper} from './debugger_store_helpers'; - -import { - DebuggerState, - SourceFileSpec, - StackFrame, - StackFrameAsArray, -} from './debugger_types'; +import {DebuggerState, SourceFileSpec, StackFrame} from './debugger_types'; /** * Find the index of a file spec among an array of file specs. diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/index.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/index.ts index 8608b239c2..39c5d67d96 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/index.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store/index.ts @@ -15,4 +15,4 @@ limitations under the License. export * from './debugger_reducers'; export * from './debugger_selectors'; -export {DEBUGGER_FEATURE_KEY, DebuggerState, State} from './debugger_types'; +export {DebuggerState, DEBUGGER_FEATURE_KEY, State} from './debugger_types'; diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/testing/index.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/testing/index.ts index d20eb3408b..1bfe658c30 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/testing/index.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/testing/index.ts @@ -15,31 +15,29 @@ limitations under the License. import {Component, NgModule} from '@angular/core'; import {Store} from '@ngrx/store'; - +import { + createInitialExecutionsState, + createInitialGraphExecutionsState, + createInitialGraphsState, +} from '../store/debugger_reducers'; import { Alerts, AlertType, DataLoadState, - DEBUGGER_FEATURE_KEY, DebuggerState, + DEBUGGER_FEATURE_KEY, Execution, + ExecutionDigest, Executions, GraphExecution, + GraphExecutions, GraphOpInfo, Graphs, - ExecutionDigest, - GraphExecutions, InfNanAlert, SourceCodeState, - State, StackFrame, - StackFrameAsArray, + State, } from '../store/debugger_types'; -import { - createInitialExecutionsState, - createInitialGraphExecutionsState, - createInitialGraphsState, -} from '../store/debugger_reducers'; export function createTestInfNanAlert( override?: Partial diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/alerts/alerts_component.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/alerts/alerts_component.ts index c3e12a7238..12601ba0b0 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/alerts/alerts_component.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/alerts/alerts_component.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Component, EventEmitter, Input, Output} from '@angular/core'; - import {AlertType} from '../../store/debugger_types'; export interface AlertTypeDisplay { diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/alerts/alerts_container.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/alerts/alerts_container.ts index 1dea0a0af6..56a1ba43c3 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/alerts/alerts_container.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/alerts/alerts_container.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {ChangeDetectionStrategy, Component} from '@angular/core'; import {createSelector, select, Store} from '@ngrx/store'; - import {alertTypeFocusToggled} from '../../actions'; import { getAlertsBreakdown, diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/alerts/alerts_container_test.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/alerts/alerts_container_test.ts index 4debf95e77..337fbf4d95 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/alerts/alerts_container_test.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/alerts/alerts_container_test.ts @@ -18,27 +18,25 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {alertTypeFocusToggled} from '../../actions'; import {DebuggerComponent} from '../../debugger_component'; import {DebuggerContainer} from '../../debugger_container'; -import {State, AlertType} from '../../store/debugger_types'; +import {AlertType, State} from '../../store/debugger_types'; import { createAlertsState, createDebuggerState, createState, } from '../../testing'; -import {AlertsContainer} from './alerts_container'; -import {AlertsModule} from './alerts_module'; import {ExecutionDataModule} from '../execution_data/execution_data_module'; import {GraphExecutionsModule} from '../graph_executions/graph_executions_module'; import {InactiveModule} from '../inactive/inactive_module'; import {SourceFilesModule} from '../source_files/source_files_module'; import {StackTraceModule} from '../stack_trace/stack_trace_module'; import {TimelineModule} from '../timeline/timeline_module'; +import {AlertsContainer} from './alerts_container'; +import {AlertsModule} from './alerts_module'; describe('Alerts Container', () => { let store: MockStore; diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/alerts/alerts_module.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/alerts/alerts_module.ts index 30c39ad1b7..c00ba69870 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/alerts/alerts_module.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/alerts/alerts_module.ts @@ -15,7 +15,6 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {AlertsComponent} from './alerts_component'; import {AlertsContainer} from './alerts_container'; diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/debug_tensor_value/debug_tensor_value_component.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/debug_tensor_value/debug_tensor_value_component.ts index 8e67d92e60..1e8e50ceda 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/debug_tensor_value/debug_tensor_value_component.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/debug_tensor_value/debug_tensor_value_component.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Component, Input} from '@angular/core'; - import {DebugTensorValue} from '../../store/debugger_types'; const basicDebugInfoStyle = ` diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/debug_tensor_value/debug_tensor_value_component_test.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/debug_tensor_value/debug_tensor_value_component_test.ts index 1ad97f8f93..5f8df16452 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/debug_tensor_value/debug_tensor_value_component_test.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/debug_tensor_value/debug_tensor_value_component_test.ts @@ -18,9 +18,8 @@ limitations under the License. import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - -import {parseDebugTensorValue} from '../../store/debug_tensor_value'; import {TensorDebugMode} from '../../store/debugger_types'; +import {parseDebugTensorValue} from '../../store/debug_tensor_value'; import { DebugTensorDTypeComponent, DebugTensorHasInfOrNaNComponent, diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/debug_tensor_value/debug_tensor_value_module.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/debug_tensor_value/debug_tensor_value_module.ts index d467e0d5bd..68f5c2a944 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/debug_tensor_value/debug_tensor_value_module.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/debug_tensor_value/debug_tensor_value_module.ts @@ -15,7 +15,6 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import { DebugTensorDTypeComponent, DebugTensorHasInfOrNaNComponent, diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/execution_data/execution_data_component.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/execution_data/execution_data_component.ts index ad3ac9824b..c116a0c843 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/execution_data/execution_data_component.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/execution_data/execution_data_component.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Component, Input} from '@angular/core'; - import {Execution, TensorDebugMode} from '../../store/debugger_types'; import {parseDebugTensorValue} from '../../store/debug_tensor_value'; diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/execution_data/execution_data_container.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/execution_data/execution_data_container.ts index 6a8c57325a..7bf3586bd5 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/execution_data/execution_data_container.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/execution_data/execution_data_container.ts @@ -13,11 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Component, Input} from '@angular/core'; -import {select, Store, createSelector} from '@ngrx/store'; - -import {Execution, State, TensorDebugMode} from '../../store/debugger_types'; - +import {createSelector, select, Store} from '@ngrx/store'; import {getFocusedExecutionData} from '../../store'; +import {Execution, State, TensorDebugMode} from '../../store/debugger_types'; import {DTYPE_ENUM_TO_NAME} from '../../tf_dtypes'; const UNKNOWN_DTYPE_NAME = 'Unknown dtype'; diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/execution_data/execution_data_container_test.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/execution_data/execution_data_container_test.ts index 424689de9a..ea2fd30dd8 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/execution_data/execution_data_container_test.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/execution_data/execution_data_container_test.ts @@ -18,10 +18,8 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {DebuggerComponent} from '../../debugger_component'; import {DebuggerContainer} from '../../debugger_container'; import { diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/execution_data/execution_data_module.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/execution_data/execution_data_module.ts index e8d6921804..20230b928e 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/execution_data/execution_data_module.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/execution_data/execution_data_module.ts @@ -15,7 +15,6 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {DebugTensorValueModule} from '../debug_tensor_value/debug_tensor_value_module'; import {ExecutionDataComponent} from './execution_data_component'; import {ExecutionDataContainer} from './execution_data_container'; diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_component.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_component.ts index cf651d11a8..c59638bc15 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_component.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_component.ts @@ -20,7 +20,6 @@ import { Input, Output, } from '@angular/core'; - import { GraphOpConsumerSpec, GraphOpInfo, diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_container.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_container.ts index 057684bd75..dcf4c360b7 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_container.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_container.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {Component} from '@angular/core'; import {select, Store} from '@ngrx/store'; - import {graphOpFocused} from '../../actions'; import { getFocusedGraphOpConsumers, diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_container_test.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_container_test.ts index 1b4c45222d..2ba13331a4 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_container_test.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_container_test.ts @@ -18,19 +18,17 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; - import {graphOpFocused} from '../../actions'; import {DebuggerComponent} from '../../debugger_component'; import {DebuggerContainer} from '../../debugger_container'; -import {State} from '../../store/debugger_types'; import { getFocusedGraphOpConsumers, getFocusedGraphOpInfo, getFocusedGraphOpInputs, } from '../../store'; +import {State} from '../../store/debugger_types'; import { createDebuggerState, createState, diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_module.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_module.ts index 39b82b3a06..1b6dd573a8 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_module.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_module.ts @@ -15,7 +15,6 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {GraphComponent} from './graph_component'; import {GraphContainer} from './graph_container'; import {GraphOpComponent} from './graph_op_component'; diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_op_component.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_op_component.ts index 597326e327..3f2024c53b 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_op_component.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph/graph_op_component.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {Component, EventEmitter, Input, Output} from '@angular/core'; - import {GraphOpInfo} from '../../store/debugger_types'; @Component({ diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph_executions/graph_executions_component.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph_executions/graph_executions_component.ts index ed8dfecd8f..903b79792e 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph_executions/graph_executions_component.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph_executions/graph_executions_component.ts @@ -24,9 +24,8 @@ import { SimpleChanges, ViewChild, } from '@angular/core'; - -import {parseDebugTensorValue} from '../../store/debug_tensor_value'; import {GraphExecution} from '../../store/debugger_types'; +import {parseDebugTensorValue} from '../../store/debug_tensor_value'; @Component({ selector: 'graph-executions-component', diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph_executions/graph_executions_container.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph_executions/graph_executions_container.ts index 82153fa761..288224bfbf 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph_executions/graph_executions_container.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph_executions/graph_executions_container.ts @@ -14,16 +14,15 @@ limitations under the License. ==============================================================================*/ import {Component} from '@angular/core'; import {createSelector, select, Store} from '@ngrx/store'; - import { graphExecutionFocused, graphExecutionScrollToIndex, } from '../../actions'; import { + getFocusedGraphExecutionInputIndices, getGraphExecutionData, getGraphExecutionFocusIndex, getNumGraphExecutions, - getFocusedGraphExecutionInputIndices, } from '../../store'; import {State} from '../../store/debugger_types'; diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph_executions/graph_executions_container_test.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph_executions/graph_executions_container_test.ts index 9571d49f90..7f9b0e12ef 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph_executions/graph_executions_container_test.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph_executions/graph_executions_container_test.ts @@ -19,24 +19,22 @@ import {CdkVirtualScrollViewport} from '@angular/cdk/scrolling'; import {CommonModule} from '@angular/common'; import {fakeAsync, TestBed, tick} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; - import {graphExecutionFocused} from '../../actions'; import {DebuggerComponent} from '../../debugger_component'; import {DebuggerContainer} from '../../debugger_container'; import { - State, - GraphExecution, - TensorDebugMode, -} from '../../store/debugger_types'; -import { + getFocusedGraphExecutionInputIndices, getGraphExecutionData, getGraphExecutionFocusIndex, getNumGraphExecutions, - getFocusedGraphExecutionInputIndices, } from '../../store'; +import { + GraphExecution, + State, + TensorDebugMode, +} from '../../store/debugger_types'; import { createDebuggerState, createState, diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph_executions/graph_executions_module.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph_executions/graph_executions_module.ts index f90afb617f..204ec39691 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph_executions/graph_executions_module.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/graph_executions/graph_executions_module.ts @@ -16,7 +16,6 @@ limitations under the License. import {ScrollingModule} from '@angular/cdk/scrolling'; import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {DebugTensorValueModule} from '../debug_tensor_value/debug_tensor_value_module'; import {GraphExecutionsComponent} from './graph_executions_component'; import {GraphExecutionsContainer} from './graph_executions_container'; diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/inactive/inactive_module.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/inactive/inactive_module.ts index 403444e71b..247654d586 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/inactive/inactive_module.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/inactive/inactive_module.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - import {InactiveComponent} from './inactive_component'; import {InactiveContainer} from './inactive_container'; diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/source_files/source_files_component.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/source_files/source_files_component.ts index 298a30728d..05b00bf1f9 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/source_files/source_files_component.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/source_files/source_files_component.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Component, Input} from '@angular/core'; - import {SourceFileContent, StackFrame} from '../../store/debugger_types'; /** diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/source_files/source_files_container.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/source_files/source_files_container.ts index 8b5bcbb0ce..d26363d88f 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/source_files/source_files_container.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/source_files/source_files_container.ts @@ -15,7 +15,6 @@ limitations under the License. import {Component} from '@angular/core'; import {Store} from '@ngrx/store'; import {Observable} from 'rxjs'; - import {State as OtherAppState} from '../../../../../webapp/app_state'; import {getDarkModeEnabled} from '../../../../../webapp/selectors'; import { diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/source_files/source_files_container_test.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/source_files/source_files_container_test.ts index 544b7da6bc..f7aebe8b4a 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/source_files/source_files_container_test.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/source_files/source_files_container_test.ts @@ -18,32 +18,30 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {MockStore, provideMockStore} from '@ngrx/store/testing'; +import {State as OtherAppState} from '../../../../../webapp/app_state'; +import {getDarkModeEnabled} from '../../../../../webapp/selectors'; import { setUpMonacoFakes, tearDownMonacoFakes, } from '../../../../../webapp/widgets/source_code/testing'; import {DebuggerComponent} from '../../debugger_component'; import {DebuggerContainer} from '../../debugger_container'; -import {getDarkModeEnabled} from '../../../../../webapp/selectors'; +import { + getFocusedSourceFileContent, + getFocusedSourceLineSpec, +} from '../../store'; import { DataLoadState, State as DebuggerState, } from '../../store/debugger_types'; -import {State as OtherAppState} from '../../../../../webapp/app_state'; import {createDebuggerState, createState} from '../../testing'; import {AlertsModule} from '../alerts/alerts_module'; import {ExecutionDataModule} from '../execution_data/execution_data_module'; import {GraphExecutionsModule} from '../graph_executions/graph_executions_module'; import {InactiveModule} from '../inactive/inactive_module'; import {StackTraceModule} from '../stack_trace/stack_trace_module'; -import { - getFocusedSourceFileContent, - getFocusedSourceLineSpec, -} from '../../store'; import {TimelineModule} from '../timeline/timeline_module'; import {SourceFilesContainer} from './source_files_container'; import {SourceFilesModule} from './source_files_module'; diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/source_files/source_files_module.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/source_files/source_files_module.ts index ea435477ce..cd13bf56c6 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/source_files/source_files_module.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/source_files/source_files_module.ts @@ -15,7 +15,6 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {SourceCodeModule} from '../../../../../webapp/widgets/source_code/source_code_module'; import {SourceFilesComponent} from './source_files_component'; import {SourceFilesContainer} from './source_files_container'; diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_component.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_component.ts index 01aedea98e..b10c51f88d 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_component.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_component.ts @@ -21,7 +21,6 @@ import { Output, ViewChild, } from '@angular/core'; - import {CodeLocationType} from '../../store/debugger_types'; export interface StackFrameForDisplay { diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_container.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_container.ts index 67a5c38f14..2e95ce46f0 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_container.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_container.ts @@ -14,8 +14,6 @@ limitations under the License. ==============================================================================*/ import {Component} from '@angular/core'; import {createSelector, select, Store} from '@ngrx/store'; - -import {CodeLocationType, State} from '../../store/debugger_types'; import {sourceLineFocused} from '../../actions'; import { getCodeLocationOrigin, @@ -23,6 +21,7 @@ import { getFocusedStackFrames, getStickToBottommostFrameInFocusedFile, } from '../../store'; +import {CodeLocationType, State} from '../../store/debugger_types'; import {StackFrameForDisplay} from './stack_trace_component'; @Component({ diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_container_test.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_container_test.ts index 10c2001a3f..fbab0c7121 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_container_test.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_container_test.ts @@ -18,20 +18,18 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {sourceLineFocused} from '../../actions'; import {DebuggerComponent} from '../../debugger_component'; import {DebuggerContainer} from '../../debugger_container'; -import {CodeLocationType, State} from '../../store/debugger_types'; import { getCodeLocationOrigin, - getFocusedStackFrames, getFocusedSourceLineSpec, + getFocusedStackFrames, getStickToBottommostFrameInFocusedFile, } from '../../store'; +import {CodeLocationType, State} from '../../store/debugger_types'; import { createDebuggerState, createState, diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_module.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_module.ts index eebbf93e1a..1693ea2b0f 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_module.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/stack_trace/stack_trace_module.ts @@ -15,7 +15,6 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {SourceCodeModule} from '../../../../../webapp/widgets/source_code/source_code_module'; import {StackTraceComponent} from './stack_trace_component'; import {StackTraceContainer} from './stack_trace_container'; diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_component.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_component.ts index dc1b8ad05d..2607307084 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_component.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_component.ts @@ -19,7 +19,7 @@ import { Input, Output, } from '@angular/core'; -import {Execution, AlertType} from '../../store/debugger_types'; +import {AlertType, Execution} from '../../store/debugger_types'; export interface ExecutionDigestForDisplay { // Op type for long-form display. diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_container.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_container.ts index 34b856b058..525bc52b18 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_container.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_container.ts @@ -13,9 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {ChangeDetectionStrategy, Component} from '@angular/core'; -import {select, Store, createSelector} from '@ngrx/store'; - -import {State} from '../../store/debugger_types'; +import {createSelector, select, Store} from '@ngrx/store'; import { executionDigestFocused, executionScrollLeft, @@ -25,16 +23,20 @@ import { import { getActiveRunId, getDisplayCount, - getNumExecutionsLoaded, - getNumExecutions, getExecutionPageSize, getExecutionScrollBeginIndex, + getFocusAlertTypesOfVisibleExecutionDigests, getFocusedExecutionDisplayIndex, getFocusedExecutionIndex, + getNumExecutions, + getNumExecutionsLoaded, getVisibleExecutionDigests, - getFocusAlertTypesOfVisibleExecutionDigests, } from '../../store'; -import {DataLoadState, ExecutionDigest} from '../../store/debugger_types'; +import { + DataLoadState, + ExecutionDigest, + State, +} from '../../store/debugger_types'; import {ExecutionDigestForDisplay} from './timeline_component'; const FUNCTION_OP_TYPE_PREFIXES: string[] = [ diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_container_test.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_container_test.ts index 6d38363577..c05cbba665 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_container_test.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_container_test.ts @@ -18,10 +18,8 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import { executionScrollLeft, executionScrollRight, @@ -30,7 +28,7 @@ import { import {DebuggerComponent} from '../../debugger_component'; import {DebuggerContainer} from '../../debugger_container'; import {getNumExecutions} from '../../store'; -import {State, AlertType} from '../../store/debugger_types'; +import {AlertType, State} from '../../store/debugger_types'; import { createAlertsState, createDebuggerState, diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_module.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_module.ts index b9c8b3c9fc..97ef9b3a1e 100644 --- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_module.ts +++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_module.ts @@ -17,7 +17,6 @@ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {MatButtonModule} from '@angular/material/button'; import {MatSliderModule} from '@angular/material/slider'; - import {ExecutionDataModule} from '../execution_data/execution_data_module'; import {TimelineComponent} from './timeline_component'; import {TimelineContainer} from './timeline_container'; diff --git a/tensorboard/plugins/distribution/tf_distribution_dashboard/tf-distribution-dashboard.ts b/tensorboard/plugins/distribution/tf_distribution_dashboard/tf-distribution-dashboard.ts index 01158870c4..44814345fc 100644 --- a/tensorboard/plugins/distribution/tf_distribution_dashboard/tf-distribution-dashboard.ts +++ b/tensorboard/plugins/distribution/tf_distribution_dashboard/tf-distribution-dashboard.ts @@ -13,19 +13,18 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {computed, customElement, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import * as _ from 'lodash'; - import '../../../components/polymer/irons_and_papers'; import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import {getTags} from '../../../components/tf_backend/backend'; import {RequestManager} from '../../../components/tf_backend/requestManager'; import {getRouter} from '../../../components/tf_backend/router'; import { + categorizeRunTagCombinations, RunTagCategory, RunToTag, - categorizeRunTagCombinations, } from '../../../components/tf_categorization_utils/categorizationUtils'; import '../../../components/tf_categorization_utils/tf-tag-filterer'; import '../../../components/tf_dashboard_common/dashboard-style'; @@ -33,8 +32,8 @@ import '../../../components/tf_dashboard_common/tf-dashboard-layout'; import '../../../components/tf_dashboard_common/tf-option-selector'; import '../../../components/tf_paginated_view/tf-category-paginated-view'; import '../../../components/tf_runs_selector/tf-runs-selector'; -import {TfDistributionLoader} from './tf-distribution-loader'; import './tf-distribution-loader'; +import {TfDistributionLoader} from './tf-distribution-loader'; /** A frontend that displays a set of tf-distribution-loaders, each of diff --git a/tensorboard/plugins/distribution/tf_distribution_dashboard/tf-distribution-loader.ts b/tensorboard/plugins/distribution/tf_distribution_dashboard/tf-distribution-loader.ts index c581797db3..18fa2ef742 100644 --- a/tensorboard/plugins/distribution/tf_distribution_dashboard/tf-distribution-loader.ts +++ b/tensorboard/plugins/distribution/tf_distribution_dashboard/tf-distribution-loader.ts @@ -13,9 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {computed, customElement, observe, property} from '@polymer/decorators'; - +import {html, PolymerElement} from '@polymer/polymer'; import '../../../components/polymer/irons_and_papers'; import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import {Canceller} from '../../../components/tf_backend/canceller'; @@ -28,8 +27,8 @@ import { DataLoaderBehavior, RequestDataCallback, } from '../../../components/tf_dashboard_common/data-loader-behavior'; -import {VzDistributionChart} from '../vz_distribution_chart/vz-distribution-chart'; import '../vz_distribution_chart/vz-distribution-chart'; +import {VzDistributionChart} from '../vz_distribution_chart/vz-distribution-chart'; export interface TfDistributionLoader extends HTMLElement { reload(): void; diff --git a/tensorboard/plugins/distribution/vz_distribution_chart/vz-distribution-chart.ts b/tensorboard/plugins/distribution/vz_distribution_chart/vz-distribution-chart.ts index 423cd23c59..bd4696b003 100644 --- a/tensorboard/plugins/distribution/vz_distribution_chart/vz-distribution-chart.ts +++ b/tensorboard/plugins/distribution/vz_distribution_chart/vz-distribution-chart.ts @@ -14,17 +14,16 @@ limitations under the License. ==============================================================================*/ import {customElement, observe, property} from '@polymer/decorators'; -import {PolymerElement, html} from '@polymer/polymer'; -import * as Plottable from 'plottable'; +import {html, PolymerElement} from '@polymer/polymer'; import * as d3 from 'd3'; import * as _ from 'lodash'; - +import * as Plottable from 'plottable'; import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import '../../../components/polymer/plottable-style'; import { - Y_AXIS_FORMATTER_PRECISION, getXComponents, multiscaleFormatter, + Y_AXIS_FORMATTER_PRECISION, } from '../../../components/vz_chart_helpers/vz-chart-helpers'; export class DistributionChart { diff --git a/tensorboard/plugins/graph/tf_graph/tf-graph-minimap.ts b/tensorboard/plugins/graph/tf_graph/tf-graph-minimap.ts index 9e20e95bca..5725b417c0 100644 --- a/tensorboard/plugins/graph/tf_graph/tf-graph-minimap.ts +++ b/tensorboard/plugins/graph/tf_graph/tf-graph-minimap.ts @@ -13,9 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement} from '@polymer/decorators'; - +import {html, PolymerElement} from '@polymer/polymer'; import * as tf_scene_minimap from '../tf_graph_common/minimap'; @customElement('tf-graph-minimap') diff --git a/tensorboard/plugins/graph/tf_graph/tf-graph-scene.ts b/tensorboard/plugins/graph/tf_graph/tf-graph-scene.ts index 5fd04d70d8..12649ff9c9 100644 --- a/tensorboard/plugins/graph/tf_graph/tf-graph-scene.ts +++ b/tensorboard/plugins/graph/tf_graph/tf-graph-scene.ts @@ -13,28 +13,25 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement} from '@polymer/polymer'; import {customElement, observe, property} from '@polymer/decorators'; -import * as _ from 'lodash'; +import {PolymerElement} from '@polymer/polymer'; import * as d3 from 'd3'; - -import './tf-graph-minimap'; -import '../../../components/tf_dashboard_common/tensorboard-color'; +import * as _ from 'lodash'; +import {DarkModeMixin} from '../../../components/polymer/dark_mode_mixin'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import * as tb_debug from '../../../components/tb_debug'; - +import '../../../components/tf_dashboard_common/tensorboard-color'; import * as tf_graph from '../tf_graph_common/graph'; -import * as tf_graph_scene from '../tf_graph_common/scene'; -import * as tf_graph_scene_node from '../tf_graph_common/node'; -import * as tf_graph_util from '../tf_graph_common/util'; import * as tf_graph_layout from '../tf_graph_common/layout'; import * as tf_graph_minimap from '../tf_graph_common/minimap'; +import * as tf_graph_scene_node from '../tf_graph_common/node'; import * as tf_graph_render from '../tf_graph_common/render'; -import {template} from './tf-graph-scene.html'; - -import {DarkModeMixin} from '../../../components/polymer/dark_mode_mixin'; -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import * as tf_graph_scene from '../tf_graph_common/scene'; import {TfGraphScene} from '../tf_graph_common/tf-graph-scene'; +import * as tf_graph_util from '../tf_graph_common/util'; import {ColorBy} from '../tf_graph_common/view_types'; +import './tf-graph-minimap'; +import {template} from './tf-graph-scene.html'; @customElement('tf-graph-scene') class TfGraphScene2 diff --git a/tensorboard/plugins/graph/tf_graph/tf-graph.ts b/tensorboard/plugins/graph/tf_graph/tf-graph.ts index f028106d10..65b8f51e8f 100644 --- a/tensorboard/plugins/graph/tf_graph/tf-graph.ts +++ b/tensorboard/plugins/graph/tf_graph/tf-graph.ts @@ -13,21 +13,20 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, observe, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import * as d3 from 'd3'; import * as _ from 'lodash'; - import '../../../components/polymer/irons_and_papers'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import * as tb_debug from '../../../components/tb_debug'; -import './tf-graph-scene'; import * as tf_graph from '../tf_graph_common/graph'; -import * as tf_graph_scene from '../tf_graph_common/scene'; -import * as tf_graph_util from '../tf_graph_common/util'; import * as tf_graph_hierarchy from '../tf_graph_common/hierarchy'; import * as tf_graph_render from '../tf_graph_common/render'; -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import * as tf_graph_scene from '../tf_graph_common/scene'; +import * as tf_graph_util from '../tf_graph_common/util'; import {ColorBy} from '../tf_graph_common/view_types'; +import './tf-graph-scene'; @customElement('tf-graph') class TfGraph extends LegacyElementMixin(PolymerElement) { diff --git a/tensorboard/plugins/graph/tf_graph_app/tf-graph-app.ts b/tensorboard/plugins/graph/tf_graph_app/tf-graph-app.ts index 54fb36d45c..644bcb4119 100644 --- a/tensorboard/plugins/graph/tf_graph_app/tf-graph-app.ts +++ b/tensorboard/plugins/graph/tf_graph_app/tf-graph-app.ts @@ -12,14 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; - +import {html, PolymerElement} from '@polymer/polymer'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import '../tf_graph_board/tf-graph-board'; +import * as tf_graph_render from '../tf_graph_common/render'; import '../tf_graph_controls/tf-graph-controls'; import '../tf_graph_loader/tf-graph-loader'; -import * as tf_graph_render from '../tf_graph_common/render'; -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; /** * Stand alone element of tf-graph for embedding. diff --git a/tensorboard/plugins/graph/tf_graph_board/tf-graph-board.ts b/tensorboard/plugins/graph/tf_graph_board/tf-graph-board.ts index a7840b9aef..9fccbf2494 100644 --- a/tensorboard/plugins/graph/tf_graph_board/tf-graph-board.ts +++ b/tensorboard/plugins/graph/tf_graph_board/tf-graph-board.ts @@ -12,17 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, observe, property} from '@polymer/decorators'; - +import {html, PolymerElement} from '@polymer/polymer'; import '../../../components/polymer/irons_and_papers'; -import '../tf_graph_info/tf-graph-info'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import '../tf_graph/tf-graph'; import * as tf_graph from '../tf_graph_common/graph'; +import * as tf_graph_hierarchy from '../tf_graph_common/hierarchy'; import * as tf_graph_render from '../tf_graph_common/render'; -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import {ColorBy} from '../tf_graph_common/view_types'; -import * as tf_graph_hierarchy from '../tf_graph_common/hierarchy'; +import '../tf_graph_info/tf-graph-info'; /** * Some UX features, such as 'color by structure', rely on the 'template' diff --git a/tensorboard/plugins/graph/tf_graph_common/common_test.ts b/tensorboard/plugins/graph/tf_graph_common/common_test.ts index 5985287be9..c9665fd9b6 100644 --- a/tensorboard/plugins/graph/tf_graph_common/common_test.ts +++ b/tensorboard/plugins/graph/tf_graph_common/common_test.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as tb_debug from '../../../components/tb_debug'; -import * as tf_graph from './graph'; import * as tf_graph_common from './common'; +import * as tf_graph from './graph'; import * as tf_graph_hierarchy from './hierarchy'; import * as tf_graph_loader from './loader'; import * as tf_graph_parser from './parser'; diff --git a/tensorboard/plugins/graph/tf_graph_common/contextmenu.ts b/tensorboard/plugins/graph/tf_graph_common/contextmenu.ts index 49de5b3d8a..68d064aa2c 100644 --- a/tensorboard/plugins/graph/tf_graph_common/contextmenu.ts +++ b/tensorboard/plugins/graph/tf_graph_common/contextmenu.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as d3 from 'd3'; - import {TfGraphScene} from './tf-graph-scene'; export interface TitleFunction { diff --git a/tensorboard/plugins/graph/tf_graph_common/edge.ts b/tensorboard/plugins/graph/tf_graph_common/edge.ts index 4a1dcb90da..51c15da5b8 100644 --- a/tensorboard/plugins/graph/tf_graph_common/edge.ts +++ b/tensorboard/plugins/graph/tf_graph_common/edge.ts @@ -15,10 +15,8 @@ limitations under the License. import * as d3 from 'd3'; import {graphlib} from 'dagre'; import * as _ from 'lodash'; - -import {MIN_EDGE_WIDTH, MAX_EDGE_WIDTH} from './common'; import * as tf_graph_common from './common'; -import {Class} from './common'; +import {Class, MAX_EDGE_WIDTH, MIN_EDGE_WIDTH} from './common'; import {BaseEdge, EDGE_KEY_DELIM, Metaedge, OpNode} from './graph'; import * as render from './render'; import {EdgeData} from './render'; diff --git a/tensorboard/plugins/graph/tf_graph_common/graph.ts b/tensorboard/plugins/graph/tf_graph_common/graph.ts index 030a349884..d1954d2659 100644 --- a/tensorboard/plugins/graph/tf_graph_common/graph.ts +++ b/tensorboard/plugins/graph/tf_graph_common/graph.ts @@ -14,9 +14,7 @@ limitations under the License. ==============================================================================*/ import {graphlib} from 'dagre'; import * as _ from 'lodash'; - import * as tb_debug from '../../../components/tb_debug'; - import {NodeStats, ProgressTracker} from './common'; import {Hierarchy} from './hierarchy'; import * as tf_graph_proto from './proto'; diff --git a/tensorboard/plugins/graph/tf_graph_common/hierarchy.ts b/tensorboard/plugins/graph/tf_graph_common/hierarchy.ts index c85f06454e..1bc4519f65 100644 --- a/tensorboard/plugins/graph/tf_graph_common/hierarchy.ts +++ b/tensorboard/plugins/graph/tf_graph_common/hierarchy.ts @@ -18,34 +18,32 @@ limitations under the License. import * as d3 from 'd3'; import {graphlib} from 'dagre'; import * as _ from 'lodash'; - import * as tb_debug from '../../../components/tb_debug'; - import {NodeStats, ProgressTracker} from './common'; -import * as template from './template'; +import * as tf_graph from './graph'; import { - ROOT_NAME, + createGraph, + createMetaedge, + createMetanode, + createSeriesNode, + Edges, + getHierarchicalPath, + getSeriesNodeName, GraphType, GroupNode, + LibraryFunctionData, Metaedge, - Metanode, MetaedgeImpl, + Metanode, Node, NodeType, OpNode, + ROOT_NAME, SeriesNode, SlimGraph, - createGraph, - createMetaedge, - createMetanode, - createSeriesNode, - getHierarchicalPath, - getSeriesNodeName, - Edges, - LibraryFunctionData, } from './graph'; -import * as tf_graph from './graph'; import * as tf_graph_proto from './proto'; +import * as template from './template'; import * as tf_graph_util from './util'; export enum HierarchyEvent { diff --git a/tensorboard/plugins/graph/tf_graph_common/layout.ts b/tensorboard/plugins/graph/tf_graph_common/layout.ts index 9d4a9f5efc..939ff8ab16 100644 --- a/tensorboard/plugins/graph/tf_graph_common/layout.ts +++ b/tensorboard/plugins/graph/tf_graph_common/layout.ts @@ -14,10 +14,8 @@ limitations under the License. ==============================================================================*/ import * as d3 from 'd3'; import * as dagre from 'dagre'; - import {graphlib} from 'dagre'; import * as _ from 'lodash'; - import {NodeType} from './graph'; import * as render from './render'; diff --git a/tensorboard/plugins/graph/tf_graph_common/loader.ts b/tensorboard/plugins/graph/tf_graph_common/loader.ts index 58923e9104..43b62fc458 100644 --- a/tensorboard/plugins/graph/tf_graph_common/loader.ts +++ b/tensorboard/plugins/graph/tf_graph_common/loader.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as tb_debug from '../../../components/tb_debug'; - import * as tf_graph_common from './common'; import * as tf_graph from './graph'; import * as hierarchy from './hierarchy'; diff --git a/tensorboard/plugins/graph/tf_graph_common/node.ts b/tensorboard/plugins/graph/tf_graph_common/node.ts index 0f7a6233cd..a70692ca49 100644 --- a/tensorboard/plugins/graph/tf_graph_common/node.ts +++ b/tensorboard/plugins/graph/tf_graph_common/node.ts @@ -14,13 +14,14 @@ limitations under the License. ==============================================================================*/ import * as d3 from 'd3'; import * as _ from 'lodash'; - -import {Class, FontSizeInPx, selectChild, selectOrCreateChild} from './common'; import * as tf_graph_common from './common'; +import {Class, FontSizeInPx, selectChild, selectOrCreateChild} from './common'; import * as contextmenu from './contextmenu'; import * as edge from './edge'; +import * as tf_graph from './graph'; import { BridgeNode, + getIncludeNodeButtonString, Metanode, MetanodeImpl, Node, @@ -28,17 +29,14 @@ import { OpNode, OpNodeImpl, SeriesNode, - getIncludeNodeButtonString, } from './graph'; -import * as tf_graph from './graph'; import * as layout from './layout'; -import {RenderNodeInfo} from './render'; import * as render from './render'; -import {positionEllipse, positionRect} from './scene'; +import {RenderNodeInfo} from './render'; import * as tf_graph_scene from './scene'; -import * as tf_graph_util from './util'; - +import {positionEllipse, positionRect} from './scene'; import {TfGraphScene} from './tf-graph-scene'; +import * as tf_graph_util from './util'; import {ColorBy} from './view_types'; /** diff --git a/tensorboard/plugins/graph/tf_graph_common/op.ts b/tensorboard/plugins/graph/tf_graph_common/op.ts index ae37c452a2..e8412cd93e 100644 --- a/tensorboard/plugins/graph/tf_graph_common/op.ts +++ b/tensorboard/plugins/graph/tf_graph_common/op.ts @@ -13,10 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as _ from 'lodash'; - -import {FUNCTION_LIBRARY_NODE_PREFIX} from './graph'; -import {SlimGraph} from './graph'; -import {OpNode} from './graph'; +import {FUNCTION_LIBRARY_NODE_PREFIX, OpNode, SlimGraph} from './graph'; export interface CompatibilityProvider { opValid: (opNode: OpNode) => boolean; diff --git a/tensorboard/plugins/graph/tf_graph_common/parser.ts b/tensorboard/plugins/graph/tf_graph_common/parser.ts index 609b83d94c..24c3423a56 100644 --- a/tensorboard/plugins/graph/tf_graph_common/parser.ts +++ b/tensorboard/plugins/graph/tf_graph_common/parser.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as tb_debug from '../../../components/tb_debug'; - import {ProgressTracker} from './common'; import * as tf_graph_proto from './proto'; import * as tf_graph_util from './util'; diff --git a/tensorboard/plugins/graph/tf_graph_common/render.ts b/tensorboard/plugins/graph/tf_graph_common/render.ts index d3738476b0..d9f23e2896 100644 --- a/tensorboard/plugins/graph/tf_graph_common/render.ts +++ b/tensorboard/plugins/graph/tf_graph_common/render.ts @@ -18,7 +18,6 @@ limitations under the License. import * as d3 from 'd3'; import {graphlib} from 'dagre'; import * as _ from 'lodash'; - import * as tf_graph_common from './common'; import * as tf_graph from './graph'; import { diff --git a/tensorboard/plugins/graph/tf_graph_common/scene.ts b/tensorboard/plugins/graph/tf_graph_common/scene.ts index cbeb4d8128..d5ab22e938 100644 --- a/tensorboard/plugins/graph/tf_graph_common/scene.ts +++ b/tensorboard/plugins/graph/tf_graph_common/scene.ts @@ -13,9 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as d3 from 'd3'; -import * as _ from 'lodash'; import * as PolymerDom from '../../../components/polymer/dom'; - import { Class as _Class, selectChild as _selectChild, diff --git a/tensorboard/plugins/graph/tf_graph_common/template.ts b/tensorboard/plugins/graph/tf_graph_common/template.ts index 81cc13052f..92a76103b2 100644 --- a/tensorboard/plugins/graph/tf_graph_common/template.ts +++ b/tensorboard/plugins/graph/tf_graph_common/template.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {graphlib} from 'dagre'; import * as _ from 'lodash'; - import { GroupNode, hasSimilarDegreeSequence, diff --git a/tensorboard/plugins/graph/tf_graph_common/tf-graph-icon.ts b/tensorboard/plugins/graph/tf_graph_common/tf-graph-icon.ts index 666e063067..fb7adc4b41 100644 --- a/tensorboard/plugins/graph/tf_graph_common/tf-graph-icon.ts +++ b/tensorboard/plugins/graph/tf_graph_common/tf-graph-icon.ts @@ -13,13 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {computed, customElement, property} from '@polymer/decorators'; - +import {html, PolymerElement} from '@polymer/polymer'; import {DarkModeMixin} from '../../../components/polymer/dark_mode_mixin'; import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import '../../../components/tf_dashboard_common/tensorboard-color'; - import {MetanodeColors, OpNodeColors, SeriesNodeColors} from './render'; export enum GraphIconType { diff --git a/tensorboard/plugins/graph/tf_graph_common/tf-node-icon.ts b/tensorboard/plugins/graph/tf_graph_common/tf-node-icon.ts index 15ddf33be4..4a2a7c086c 100644 --- a/tensorboard/plugins/graph/tf_graph_common/tf-node-icon.ts +++ b/tensorboard/plugins/graph/tf_graph_common/tf-node-icon.ts @@ -13,15 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; - -import * as tf_graph_icon from './tf-graph-icon'; +import {html, PolymerElement} from '@polymer/polymer'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import * as tf_graph from '../tf_graph_common/graph'; import * as tf_graph_scene_node from '../tf_graph_common/node'; -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; - import './tf-graph-icon'; +import * as tf_graph_icon from './tf-graph-icon'; import {ColorBy} from './view_types'; @customElement('tf-node-icon') diff --git a/tensorboard/plugins/graph/tf_graph_common/util.ts b/tensorboard/plugins/graph/tf_graph_common/util.ts index d356cd4737..a932792760 100644 --- a/tensorboard/plugins/graph/tf_graph_common/util.ts +++ b/tensorboard/plugins/graph/tf_graph_common/util.ts @@ -16,7 +16,6 @@ limitations under the License. * @fileoverview Utility functions for the tensorflow graph visualizer. */ import * as _ from 'lodash'; - import {notifyActionEventFromPolymer} from '../../../components/tb_debug'; import { GraphDebugActionEventId, diff --git a/tensorboard/plugins/graph/tf_graph_controls/tf-graph-controls.ts b/tensorboard/plugins/graph/tf_graph_controls/tf-graph-controls.ts index 2fc9f2c59e..d3f1249a7e 100644 --- a/tensorboard/plugins/graph/tf_graph_controls/tf-graph-controls.ts +++ b/tensorboard/plugins/graph/tf_graph_controls/tf-graph-controls.ts @@ -13,23 +13,21 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {computed, customElement, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import * as _ from 'lodash'; - +import {DarkModeMixin} from '../../../components/polymer/dark_mode_mixin'; import '../../../components/polymer/irons_and_papers'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import * as tb_debug from '../../../components/tb_debug'; +import '../../../components/tf_dashboard_common/tensorboard-color'; import * as tf_graph_common from '../tf_graph_common/common'; -import * as tf_graph_render from '../tf_graph_common/render'; import * as tf_graph_proto from '../tf_graph_common/proto'; -import * as tf_graph_util from '../tf_graph_common/util'; - -import '../../../components/tf_dashboard_common/tensorboard-color'; +import * as tf_graph_render from '../tf_graph_common/render'; import '../tf_graph_common/tf-graph-icon'; -import '../tf_graph_node_search/tf-graph-node-search'; -import {DarkModeMixin} from '../../../components/polymer/dark_mode_mixin'; -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import * as tf_graph_util from '../tf_graph_common/util'; import {ColorBy} from '../tf_graph_common/view_types'; +import '../tf_graph_node_search/tf-graph-node-search'; interface DeviceNameExclude { regex: RegExp; diff --git a/tensorboard/plugins/graph/tf_graph_dashboard/tf-graph-dashboard.ts b/tensorboard/plugins/graph/tf_graph_dashboard/tf-graph-dashboard.ts index cb79687b12..90e2c6cd56 100644 --- a/tensorboard/plugins/graph/tf_graph_dashboard/tf-graph-dashboard.ts +++ b/tensorboard/plugins/graph/tf_graph_dashboard/tf-graph-dashboard.ts @@ -13,23 +13,21 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, observe, property} from '@polymer/decorators'; - +import {html, PolymerElement} from '@polymer/polymer'; import '../../../components/polymer/irons_and_papers'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import {Canceller} from '../../../components/tf_backend/canceller'; import {RequestManager} from '../../../components/tf_backend/requestManager'; import {getRouter} from '../../../components/tf_backend/router'; import '../../../components/tf_dashboard_common/tf-dashboard-layout'; import * as tf_storage from '../../../components/tf_storage'; import * as vz_sorting from '../../../components/vz_sorting/sorting'; -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; - import '../tf_graph_board/tf-graph-board'; -import '../tf_graph_controls/tf-graph-controls'; -import '../tf_graph_loader/tf-graph-dashboard-loader'; import * as tf_graph_op from '../tf_graph_common/op'; import * as tf_graph_render from '../tf_graph_common/render'; +import '../tf_graph_controls/tf-graph-controls'; +import '../tf_graph_loader/tf-graph-dashboard-loader'; /** * The (string) name for the run of the selected dataset in the graph dashboard. diff --git a/tensorboard/plugins/graph/tf_graph_debugger_data_card/tf-graph-debugger-data-card.ts b/tensorboard/plugins/graph/tf_graph_debugger_data_card/tf-graph-debugger-data-card.ts index 6a140cbdbf..b8a4a545c2 100644 --- a/tensorboard/plugins/graph/tf_graph_debugger_data_card/tf-graph-debugger-data-card.ts +++ b/tensorboard/plugins/graph/tf_graph_debugger_data_card/tf-graph-debugger-data-card.ts @@ -13,17 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {computed, customElement, observe, property} from '@polymer/decorators'; - -import '../../../components/polymer/irons_and_papers'; +import {html, PolymerElement} from '@polymer/polymer'; import * as PolymerDom from '../../../components/polymer/dom'; - +import '../../../components/polymer/irons_and_papers'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import * as tf_graph_render from '../tf_graph_common/render'; import * as tf_graph_scene from '../tf_graph_common/scene'; import * as tf_graph_util from '../tf_graph_common/util'; -import * as tf_graph_render from '../tf_graph_common/render'; - -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; @customElement('tf-graph-debugger-data-card') class TfGraphDebuggerDataCard extends LegacyElementMixin(PolymerElement) { diff --git a/tensorboard/plugins/graph/tf_graph_info/tf-graph-info.ts b/tensorboard/plugins/graph/tf_graph_info/tf-graph-info.ts index 6bc1a01c38..1266a6b03f 100644 --- a/tensorboard/plugins/graph/tf_graph_info/tf-graph-info.ts +++ b/tensorboard/plugins/graph/tf_graph_info/tf-graph-info.ts @@ -13,18 +13,17 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; - +import {html, PolymerElement} from '@polymer/polymer'; import '../../../components/polymer/irons_and_papers'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import * as tf_graph from '../tf_graph_common/graph'; +import {Hierarchy} from '../tf_graph_common/hierarchy'; import * as tf_graph_render from '../tf_graph_common/render'; +import {ColorBy} from '../tf_graph_common/view_types'; import '../tf_graph_debugger_data_card/tf-graph-debugger-data-card'; import '../tf_graph_op_compat_card/tf-graph-op-compat-card'; import './tf-node-info'; -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; -import {ColorBy} from '../tf_graph_common/view_types'; -import {Hierarchy} from '../tf_graph_common/hierarchy'; @customElement('tf-graph-info') class TfGraphInfo extends LegacyElementMixin(PolymerElement) { diff --git a/tensorboard/plugins/graph/tf_graph_info/tf-node-info.ts b/tensorboard/plugins/graph/tf_graph_info/tf-node-info.ts index d717b6058f..2b53d4bbef 100644 --- a/tensorboard/plugins/graph/tf_graph_info/tf-node-info.ts +++ b/tensorboard/plugins/graph/tf_graph_info/tf-node-info.ts @@ -13,22 +13,20 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {computed, customElement, observe, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import * as _ from 'lodash'; - import '../../../components/polymer/irons_and_papers'; -import '../tf_graph_common/tf-node-icon'; -import './tf-node-list-item'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import '../../../components/tf_wbr_string/tf-wbr-string'; +import * as tf_graph_scene_edge from '../tf_graph_common/edge'; import * as tf_graph from '../tf_graph_common/graph'; import * as tf_graph_hierarchy from '../tf_graph_common/hierarchy'; -import * as tf_graph_util from '../tf_graph_common/util'; -import * as tf_graph_scene_edge from '../tf_graph_common/edge'; import * as tf_graph_scene_node from '../tf_graph_common/node'; - -import '../../../components/tf_wbr_string/tf-wbr-string'; -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import '../tf_graph_common/tf-node-icon'; +import * as tf_graph_util from '../tf_graph_common/util'; import {ColorBy} from '../tf_graph_common/view_types'; +import './tf-node-list-item'; @customElement('tf-node-info') class TfNodeInfo extends LegacyElementMixin(PolymerElement) { diff --git a/tensorboard/plugins/graph/tf_graph_info/tf-node-list-item.ts b/tensorboard/plugins/graph/tf_graph_info/tf-node-list-item.ts index 54af2a2c51..b944c4e30d 100644 --- a/tensorboard/plugins/graph/tf_graph_info/tf-node-list-item.ts +++ b/tensorboard/plugins/graph/tf_graph_info/tf-node-list-item.ts @@ -13,13 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; -import '../../../components/tf_dashboard_common/tensorboard-color'; -import '../tf_graph_common/tf-node-icon'; - +import {html, PolymerElement} from '@polymer/polymer'; import {DarkModeMixin} from '../../../components/polymer/dark_mode_mixin'; import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import '../../../components/tf_dashboard_common/tensorboard-color'; +import '../tf_graph_common/tf-node-icon'; import {ColorBy} from '../tf_graph_common/view_types'; @customElement('tf-node-list-item') diff --git a/tensorboard/plugins/graph/tf_graph_loader/tf-graph-dashboard-loader.ts b/tensorboard/plugins/graph/tf_graph_loader/tf-graph-dashboard-loader.ts index db6b79bb33..9de9e59380 100644 --- a/tensorboard/plugins/graph/tf_graph_loader/tf-graph-dashboard-loader.ts +++ b/tensorboard/plugins/graph/tf_graph_loader/tf-graph-dashboard-loader.ts @@ -13,9 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement} from '@polymer/polymer'; import {customElement, observe, property} from '@polymer/decorators'; - +import {PolymerElement} from '@polymer/polymer'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import {getRouter} from '../../../components/tf_backend/router'; import * as tf_graph_common from '../tf_graph_common/common'; import * as tf_graph from '../tf_graph_common/graph'; import * as tf_graph_hierarchy from '../tf_graph_common/hierarchy'; @@ -25,9 +26,6 @@ import * as tf_graph_parser from '../tf_graph_common/parser'; import * as tf_graph_util from '../tf_graph_common/util'; import * as tf_graph_controls from '../tf_graph_controls/tf-graph-controls'; -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; -import {getRouter} from '../../../components/tf_backend/router'; - interface GraphRunTag { run: string; tag?: string; diff --git a/tensorboard/plugins/graph/tf_graph_loader/tf-graph-loader.ts b/tensorboard/plugins/graph/tf_graph_loader/tf-graph-loader.ts index af708676cd..03bf205570 100644 --- a/tensorboard/plugins/graph/tf_graph_loader/tf-graph-loader.ts +++ b/tensorboard/plugins/graph/tf_graph_loader/tf-graph-loader.ts @@ -13,14 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement} from '@polymer/polymer'; import {customElement, observe, property} from '@polymer/decorators'; - +import {PolymerElement} from '@polymer/polymer'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import * as tf_graph_hierarchy from '../tf_graph_common/hierarchy'; import * as tf_graph_loader from '../tf_graph_common/loader'; import * as tf_graph_op from '../tf_graph_common/op'; import * as tf_graph_util from '../tf_graph_common/util'; -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; @customElement('tf-graph-loader') class TfGraphLoader extends LegacyElementMixin(PolymerElement) { diff --git a/tensorboard/plugins/graph/tf_graph_node_search/tf-graph-node-search.ts b/tensorboard/plugins/graph/tf_graph_node_search/tf-graph-node-search.ts index eacef4f688..e047a5570f 100644 --- a/tensorboard/plugins/graph/tf_graph_node_search/tf-graph-node-search.ts +++ b/tensorboard/plugins/graph/tf_graph_node_search/tf-graph-node-search.ts @@ -13,15 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {computed, customElement, observe, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import * as _ from 'lodash'; - import '../../../components/polymer/irons_and_papers'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import * as tb_debug from '../../../components/tb_debug'; import '../../../components/tf_dashboard_common/tensorboard-color'; -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; - import * as tf_graph_util from '../tf_graph_common/util'; @customElement('tf-graph-node-search') diff --git a/tensorboard/plugins/graph/tf_graph_op_compat_card/tf-graph-op-compat-card.ts b/tensorboard/plugins/graph/tf_graph_op_compat_card/tf-graph-op-compat-card.ts index 3685c011cb..f9d888f8c4 100644 --- a/tensorboard/plugins/graph/tf_graph_op_compat_card/tf-graph-op-compat-card.ts +++ b/tensorboard/plugins/graph/tf_graph_op_compat_card/tf-graph-op-compat-card.ts @@ -13,18 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {computed, customElement, observe, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import * as d3 from 'd3'; - +import {DarkModeMixin} from '../../../components/polymer/dark_mode_mixin'; import '../../../components/polymer/irons_and_papers'; -import './tf-graph-op-compat-list-item'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import * as tf_graph from '../tf_graph_common/graph'; import * as tf_graph_hierarchy from '../tf_graph_common/hierarchy'; import * as tf_graph_render from '../tf_graph_common/render'; - -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; -import {DarkModeMixin} from '../../../components/polymer/dark_mode_mixin'; +import './tf-graph-op-compat-list-item'; @customElement('tf-graph-op-compat-card') class TfGraphOpCompatCard extends LegacyElementMixin( diff --git a/tensorboard/plugins/graph/tf_graph_op_compat_card/tf-graph-op-compat-list-item.ts b/tensorboard/plugins/graph/tf_graph_op_compat_card/tf-graph-op-compat-list-item.ts index b74a90eed1..42e327ca60 100644 --- a/tensorboard/plugins/graph/tf_graph_op_compat_card/tf-graph-op-compat-list-item.ts +++ b/tensorboard/plugins/graph/tf_graph_op_compat_card/tf-graph-op-compat-list-item.ts @@ -13,12 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import '../../../components/tf_dashboard_common/tensorboard-color'; import '../tf_graph_common/tf-node-icon'; - -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import {ColorBy} from '../tf_graph_common/view_types'; @customElement('tf-graph-op-compat-list-item') diff --git a/tensorboard/plugins/histogram/tf_histogram_dashboard/tf-histogram-dashboard.ts b/tensorboard/plugins/histogram/tf_histogram_dashboard/tf-histogram-dashboard.ts index 6386ef2a73..c390ec818d 100644 --- a/tensorboard/plugins/histogram/tf_histogram_dashboard/tf-histogram-dashboard.ts +++ b/tensorboard/plugins/histogram/tf_histogram_dashboard/tf-histogram-dashboard.ts @@ -14,17 +14,16 @@ limitations under the License. ==============================================================================*/ import {computed, customElement, property} from '@polymer/decorators'; -import {PolymerElement, html} from '@polymer/polymer'; +import {html, PolymerElement} from '@polymer/polymer'; import * as _ from 'lodash'; - -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import '../../../components/polymer/irons_and_papers'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import {getTags} from '../../../components/tf_backend/backend'; import {RequestManager} from '../../../components/tf_backend/requestManager'; import {getRouter} from '../../../components/tf_backend/router'; import { - RunTagCategory, categorizeRunTagCombinations, + RunTagCategory, } from '../../../components/tf_categorization_utils/categorizationUtils'; import '../../../components/tf_categorization_utils/tf-tag-filterer'; import '../../../components/tf_dashboard_common/dashboard-style'; @@ -32,8 +31,8 @@ import '../../../components/tf_dashboard_common/tf-dashboard-layout'; import '../../../components/tf_dashboard_common/tf-option-selector'; import '../../../components/tf_paginated_view/tf-category-paginated-view'; import '../../../components/tf_runs_selector/tf-runs-selector'; -import {HistogramTagInfo, TfHistogramLoader} from './tf-histogram-loader'; import './tf-histogram-loader'; +import {HistogramTagInfo, TfHistogramLoader} from './tf-histogram-loader'; @customElement('tf-histogram-dashboard') class TfHistogramDashboard extends LegacyElementMixin(PolymerElement) { diff --git a/tensorboard/plugins/histogram/tf_histogram_dashboard/tf-histogram-loader.ts b/tensorboard/plugins/histogram/tf_histogram_dashboard/tf-histogram-loader.ts index 759517bab4..11a0055851 100644 --- a/tensorboard/plugins/histogram/tf_histogram_dashboard/tf-histogram-loader.ts +++ b/tensorboard/plugins/histogram/tf_histogram_dashboard/tf-histogram-loader.ts @@ -14,11 +14,9 @@ limitations under the License. ==============================================================================*/ import {computed, customElement, observe, property} from '@polymer/decorators'; -import {PolymerElement, html} from '@polymer/polymer'; -import * as _ from 'lodash'; - -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import {html, PolymerElement} from '@polymer/polymer'; import '../../../components/polymer/irons_and_papers'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import {RequestManager} from '../../../components/tf_backend/requestManager'; import {getRouter} from '../../../components/tf_backend/router'; import {addParams} from '../../../components/tf_backend/urlPathHelpers'; @@ -31,7 +29,7 @@ import { import '../vz_histogram_timeseries/vz-histogram-timeseries'; import {VzHistogramTimeseries} from '../vz_histogram_timeseries/vz-histogram-timeseries'; import './histogramCore'; -import {VzHistogram, backendToVz} from './histogramCore'; +import {backendToVz, VzHistogram} from './histogramCore'; // Response from /data/plugin/histograms/tags. export interface HistogramTagInfo { diff --git a/tensorboard/plugins/histogram/vz_histogram_timeseries/vz-histogram-timeseries.ts b/tensorboard/plugins/histogram/vz_histogram_timeseries/vz-histogram-timeseries.ts index c72f9f912c..65d7098846 100644 --- a/tensorboard/plugins/histogram/vz_histogram_timeseries/vz-histogram-timeseries.ts +++ b/tensorboard/plugins/histogram/vz_histogram_timeseries/vz-histogram-timeseries.ts @@ -13,10 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, observe, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import * as d3Typed from 'd3'; - import {DarkModeMixin} from '../../../components/polymer/dark_mode_mixin'; import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; diff --git a/tensorboard/plugins/hparams/tf_hparams_backend/tf-hparams-backend.ts b/tensorboard/plugins/hparams/tf_hparams_backend/tf-hparams-backend.ts index 75576564eb..853b44e53e 100644 --- a/tensorboard/plugins/hparams/tf_hparams_backend/tf-hparams-backend.ts +++ b/tensorboard/plugins/hparams/tf_hparams_backend/tf-hparams-backend.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import { - RequestOptions, HttpMethodType, + RequestOptions, } from '../../../components/tf_backend/requestManager'; /* A 'tf-hparams-backend' encapsulates sending HParams API requests to the diff --git a/tensorboard/plugins/hparams/tf_hparams_dashboard/tf-hparams-dashboard.ts b/tensorboard/plugins/hparams/tf_hparams_dashboard/tf-hparams-dashboard.ts index 44dafa38b9..81dd646b77 100644 --- a/tensorboard/plugins/hparams/tf_hparams_dashboard/tf-hparams-dashboard.ts +++ b/tensorboard/plugins/hparams/tf_hparams_dashboard/tf-hparams-dashboard.ts @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import * as tf_backend from '../../../components/tf_backend/tf-backend'; -import '../tf_hparams_main/tf-hparams-main'; import * as tf_hparams_backend from '../tf_hparams_backend/tf-hparams-backend'; -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import '../tf_hparams_main/tf-hparams-main'; // Read URL at module import time, before AppRoutingEffects stomps it. const inColab = diff --git a/tensorboard/plugins/hparams/tf_hparams_main/tf-hparams-main.ts b/tensorboard/plugins/hparams/tf_hparams_main/tf-hparams-main.ts index a5d79ae36e..1da3a060b9 100644 --- a/tensorboard/plugins/hparams/tf_hparams_main/tf-hparams-main.ts +++ b/tensorboard/plugins/hparams/tf_hparams_main/tf-hparams-main.ts @@ -13,14 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; -import * as _ from 'lodash'; - +import {html, PolymerElement} from '@polymer/polymer'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import {Backend} from '../tf_hparams_backend/tf-hparams-backend'; import '../tf_hparams_query_pane/tf-hparams-query-pane'; import '../tf_hparams_sessions_pane/tf-hparams-sessions-pane'; -import {Backend} from '../tf_hparams_backend/tf-hparams-backend'; -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import '../tf_hparams_utils/hparams-split-layout'; /** diff --git a/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/axes.ts b/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/axes.ts index e321e84793..b6d467b8a7 100644 --- a/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/axes.ts +++ b/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/axes.ts @@ -14,12 +14,11 @@ limitations under the License. ==============================================================================*/ /* Defines classes that manage the axes in the parallel coordinates plot. */ import * as d3 from 'd3'; - -import * as tf_hparams_parallel_coords_plot_interaction_manager from './interaction_manager'; -import * as tf_hparams_utils from '../tf_hparams_utils/tf-hparams-utils'; -import * as tf_hparams_parallel_coords_plot_utils from './utils'; import {Schema} from '../tf_hparams_types/types'; +import * as tf_hparams_utils from '../tf_hparams_utils/tf-hparams-utils'; import * as tf_hparams_api from '../types'; +import * as tf_hparams_parallel_coords_plot_interaction_manager from './interaction_manager'; +import * as tf_hparams_parallel_coords_plot_utils from './utils'; export enum ScaleType { LINEAR = 'LINEAR', diff --git a/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/interaction_manager.ts b/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/interaction_manager.ts index 0aa13226b9..06f9261597 100644 --- a/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/interaction_manager.ts +++ b/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/interaction_manager.ts @@ -16,13 +16,11 @@ limitations under the License. This is the main entry point to the parallel coordinates implementation. */ import * as d3 from 'd3'; - +import * as tf_hparams_query_pane from '../tf_hparams_types/types'; import * as tf_hparams_utils from '../tf_hparams_utils/tf-hparams-utils'; +import * as tf_hparams_api from '../types'; import {AxesCollection} from './axes'; import {LinesCollection, LineType, SessionGroupHandle} from './lines'; -import * as tf_hparams_query_pane from '../tf_hparams_types/types'; - -import * as tf_hparams_api from '../types'; type SessionGroupCallback = (SessionGroup: tf_hparams_api.SessionGroup) => void; /** diff --git a/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/lines.ts b/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/lines.ts index 52b4c63771..85f19e18ad 100644 --- a/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/lines.ts +++ b/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/lines.ts @@ -16,15 +16,12 @@ limitations under the License. coordinates plot. */ import * as d3 from 'd3'; - +import * as tf_hparams_query_pane from '../tf_hparams_types/types'; import * as tf_hparams_utils from '../tf_hparams_utils/tf-hparams-utils'; -import * as tf_hparams_parallel_coords_plot_utils from './utils'; +import * as tf_hparams_api from '../types'; import {AxesCollection} from './axes'; import * as tf_hparams_parallel_coords_plot_interaction_manager from './interaction_manager'; - -import * as tf_hparams_query_pane from '../tf_hparams_types/types'; - -import * as tf_hparams_api from '../types'; +import * as tf_hparams_parallel_coords_plot_utils from './utils'; export enum LineType { FOREGROUND, diff --git a/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/tf-hparams-parallel-coords-plot.ts b/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/tf-hparams-parallel-coords-plot.ts index b6cfd18e87..7e32fb1958 100644 --- a/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/tf-hparams-parallel-coords-plot.ts +++ b/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/tf-hparams-parallel-coords-plot.ts @@ -64,7 +64,6 @@ import {customElement, observe, property} from '@polymer/decorators'; import {html, PolymerElement} from '@polymer/polymer'; import * as d3 from 'd3'; import * as _ from 'lodash'; - import {DarkModeMixin} from '../../../components/polymer/dark_mode_mixin'; import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import '../tf_hparams_session_group_values/tf-hparams-session-group-values'; diff --git a/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/utils.ts b/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/utils.ts index 5653f0ee51..5fe6b34f4d 100644 --- a/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/utils.ts +++ b/tensorboard/plugins/hparams/tf_hparams_parallel_coords_plot/utils.ts @@ -14,9 +14,8 @@ limitations under the License. ==============================================================================*/ /* Utility functions used by tf-hparams-parallel-coords-plot element. */ -import * as _ from 'lodash'; import * as d3 from 'd3'; - +import * as _ from 'lodash'; import * as tf_hparams_utils from '../tf_hparams_utils/tf-hparams-utils'; // Finds the "closest" path to a given 'target' point from a given array diff --git a/tensorboard/plugins/hparams/tf_hparams_parallel_coords_view/tf-hparams-parallel-coords-view.ts b/tensorboard/plugins/hparams/tf_hparams_parallel_coords_view/tf-hparams-parallel-coords-view.ts index 6b343b7497..ffc245dc09 100644 --- a/tensorboard/plugins/hparams/tf_hparams_parallel_coords_view/tf-hparams-parallel-coords-view.ts +++ b/tensorboard/plugins/hparams/tf_hparams_parallel_coords_view/tf-hparams-parallel-coords-view.ts @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; -import '../tf_hparams_scale_and_color_controls/tf-hparams-scale-and-color-controls'; +import {html, PolymerElement} from '@polymer/polymer'; import '../tf_hparams_parallel_coords_plot/tf-hparams-parallel-coords-plot'; +import '../tf_hparams_scale_and_color_controls/tf-hparams-scale-and-color-controls'; import '../tf_hparams_session_group_details/tf-hparams-session-group-details'; import '../tf_hparams_session_group_values/tf-hparams-session-group-values'; import '../tf_hparams_utils/hparams-split-layout'; diff --git a/tensorboard/plugins/hparams/tf_hparams_query_pane/tf-hparams-query-pane.ts b/tensorboard/plugins/hparams/tf_hparams_query_pane/tf-hparams-query-pane.ts index acf26030de..2d2b4bf174 100644 --- a/tensorboard/plugins/hparams/tf_hparams_query_pane/tf-hparams-query-pane.ts +++ b/tensorboard/plugins/hparams/tf_hparams_query_pane/tf-hparams-query-pane.ts @@ -13,15 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, observe, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import * as _ from 'lodash'; - import '../../../components/polymer/irons_and_papers'; -import {Canceller} from '../../../components/tf_backend/canceller'; -import * as tf_hparams_utils from '../tf_hparams_utils/tf-hparams-utils'; import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import {Canceller} from '../../../components/tf_backend/canceller'; import '../tf_hparams_utils/hparams-split-layout'; +import * as tf_hparams_utils from '../tf_hparams_utils/tf-hparams-utils'; /** * The tf-hparams-query-pane element implements controls for querying the diff --git a/tensorboard/plugins/hparams/tf_hparams_scale_and_color_controls/tf-hparams-scale-and-color-controls.ts b/tensorboard/plugins/hparams/tf_hparams_scale_and_color_controls/tf-hparams-scale-and-color-controls.ts index 91e1c6f093..ff7e39d78d 100644 --- a/tensorboard/plugins/hparams/tf_hparams_scale_and_color_controls/tf-hparams-scale-and-color-controls.ts +++ b/tensorboard/plugins/hparams/tf_hparams_scale_and_color_controls/tf-hparams-scale-and-color-controls.ts @@ -13,9 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, observe, property} from '@polymer/decorators'; - +import {html, PolymerElement} from '@polymer/polymer'; import * as PolymerDom from '../../../components/polymer/dom'; import '../../../components/polymer/irons_and_papers'; import * as tf_hparams_utils from '../tf_hparams_utils/tf-hparams-utils'; diff --git a/tensorboard/plugins/hparams/tf_hparams_scatter_plot_matrix_plot/tf-hparams-scatter-plot-matrix-plot.ts b/tensorboard/plugins/hparams/tf_hparams_scatter_plot_matrix_plot/tf-hparams-scatter-plot-matrix-plot.ts index 2c23fe53fb..4107cb3f94 100644 --- a/tensorboard/plugins/hparams/tf_hparams_scatter_plot_matrix_plot/tf-hparams-scatter-plot-matrix-plot.ts +++ b/tensorboard/plugins/hparams/tf_hparams_scatter_plot_matrix_plot/tf-hparams-scatter-plot-matrix-plot.ts @@ -13,13 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, observe, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import * as d3 from 'd3'; import * as _ from 'lodash'; - -import * as tf_hparams_utils from '../tf_hparams_utils/tf-hparams-utils'; import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import * as tf_hparams_utils from '../tf_hparams_utils/tf-hparams-utils'; /** * A d3-based scatter plot matrix visualization component. diff --git a/tensorboard/plugins/hparams/tf_hparams_scatter_plot_matrix_view/tf-hparams-scatter-plot-matrix-view.ts b/tensorboard/plugins/hparams/tf_hparams_scatter_plot_matrix_view/tf-hparams-scatter-plot-matrix-view.ts index 069dad8d58..c8309129b4 100644 --- a/tensorboard/plugins/hparams/tf_hparams_scatter_plot_matrix_view/tf-hparams-scatter-plot-matrix-view.ts +++ b/tensorboard/plugins/hparams/tf_hparams_scatter_plot_matrix_view/tf-hparams-scatter-plot-matrix-view.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import '../tf_hparams_scale_and_color_controls/tf-hparams-scale-and-color-controls'; import '../tf_hparams_scatter_plot_matrix_plot/tf-hparams-scatter-plot-matrix-plot'; import '../tf_hparams_session_group_details/tf-hparams-session-group-details'; diff --git a/tensorboard/plugins/hparams/tf_hparams_session_group_details/tf-hparams-session-group-details.ts b/tensorboard/plugins/hparams/tf_hparams_session_group_details/tf-hparams-session-group-details.ts index b8adfaf86d..1598edc758 100644 --- a/tensorboard/plugins/hparams/tf_hparams_session_group_details/tf-hparams-session-group-details.ts +++ b/tensorboard/plugins/hparams/tf_hparams_session_group_details/tf-hparams-session-group-details.ts @@ -13,18 +13,17 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, observe, property} from '@polymer/decorators'; import * as IronResizableBehavior from '@polymer/iron-resizable-behavior'; - -import {mixinBehaviors} from '../../../components/polymer/legacy_class'; +import {html, PolymerElement} from '@polymer/polymer'; import '../../../components/polymer/irons_and_papers'; +import {mixinBehaviors} from '../../../components/polymer/legacy_class'; import '../../../components/tf_backend/tf-backend'; -import {RequestDataCallback} from '../../../components/tf_dashboard_common/data-loader-behavior'; -import * as tf_hparams_utils from '../tf_hparams_utils/tf-hparams-utils'; import * as tf_color_scale from '../../../components/tf_color_scale/palettes'; +import {RequestDataCallback} from '../../../components/tf_dashboard_common/data-loader-behavior'; import * as vz_chart_helpers from '../../../components/vz_chart_helpers/vz-chart-helpers'; import '../../scalar/tf_scalar_dashboard/tf-scalar-card'; +import * as tf_hparams_utils from '../tf_hparams_utils/tf-hparams-utils'; // TODO: add dependency once the Polymer 3 scalar dashboard is migrated. // import '../tf_scalar_dashboard/tf-scalar-card'; diff --git a/tensorboard/plugins/hparams/tf_hparams_session_group_values/tf-hparams-session-group-values.ts b/tensorboard/plugins/hparams/tf_hparams_session_group_values/tf-hparams-session-group-values.ts index 5e0a3dc495..8fdf2fd631 100644 --- a/tensorboard/plugins/hparams/tf_hparams_session_group_values/tf-hparams-session-group-values.ts +++ b/tensorboard/plugins/hparams/tf_hparams_session_group_values/tf-hparams-session-group-values.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import '../tf_hparams_table_view/tf-hparams-table-view'; @customElement('tf-hparams-session-group-values') diff --git a/tensorboard/plugins/hparams/tf_hparams_sessions_pane/tf-hparams-sessions-pane.ts b/tensorboard/plugins/hparams/tf_hparams_sessions_pane/tf-hparams-sessions-pane.ts index 6d4648e834..36b449cf8f 100644 --- a/tensorboard/plugins/hparams/tf_hparams_sessions_pane/tf-hparams-sessions-pane.ts +++ b/tensorboard/plugins/hparams/tf_hparams_sessions_pane/tf-hparams-sessions-pane.ts @@ -13,9 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; - +import {html, PolymerElement} from '@polymer/polymer'; import '../../../components/polymer/irons_and_papers'; import '../tf_hparams_parallel_coords_view/tf-hparams-parallel-coords-view'; import '../tf_hparams_scatter_plot_matrix_view/tf-hparams-scatter-plot-matrix-view'; diff --git a/tensorboard/plugins/hparams/tf_hparams_table_view/tf-hparams-table-view.ts b/tensorboard/plugins/hparams/tf_hparams_table_view/tf-hparams-table-view.ts index f5c3da8252..fcabdbc5cb 100644 --- a/tensorboard/plugins/hparams/tf_hparams_table_view/tf-hparams-table-view.ts +++ b/tensorboard/plugins/hparams/tf_hparams_table_view/tf-hparams-table-view.ts @@ -13,15 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, observe, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import '@vaadin/vaadin-grid'; - +import {DarkModeMixin} from '../../../components/polymer/dark_mode_mixin'; import * as PolymerDom from '../../../components/polymer/dom'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import '../tf_hparams_session_group_details/tf-hparams-session-group-details'; import * as tf_hparams_utils from '../tf_hparams_utils/tf-hparams-utils'; -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; -import {DarkModeMixin} from '../../../components/polymer/dark_mode_mixin'; @customElement('tf-hparams-table-view') class TfHparamsTableView extends LegacyElementMixin( diff --git a/tensorboard/plugins/hparams/tf_hparams_utils/hparams-split-layout.ts b/tensorboard/plugins/hparams/tf_hparams_utils/hparams-split-layout.ts index 05504eb493..a5f37847eb 100644 --- a/tensorboard/plugins/hparams/tf_hparams_utils/hparams-split-layout.ts +++ b/tensorboard/plugins/hparams/tf_hparams_utils/hparams-split-layout.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; @customElement('hparams-split-layout') class HparamsSplitLayout extends PolymerElement { diff --git a/tensorboard/plugins/image/tf_image_dashboard/tf-image-dashboard.ts b/tensorboard/plugins/image/tf_image_dashboard/tf-image-dashboard.ts index 26b21b92a9..c701d48fd1 100644 --- a/tensorboard/plugins/image/tf_image_dashboard/tf-image-dashboard.ts +++ b/tensorboard/plugins/image/tf_image_dashboard/tf-image-dashboard.ts @@ -13,10 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +import {computed, customElement, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import * as _ from 'lodash'; -import {PolymerElement, html} from '@polymer/polymer'; -import {computed, customElement, observe, property} from '@polymer/decorators'; - import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import {getTags} from '../../../components/tf_backend/backend'; import {RequestManager} from '../../../components/tf_backend/requestManager'; diff --git a/tensorboard/plugins/image/tf_image_dashboard/tf-image-loader.ts b/tensorboard/plugins/image/tf_image_dashboard/tf-image-loader.ts index a33d603e2e..8587bde55c 100644 --- a/tensorboard/plugins/image/tf_image_dashboard/tf-image-loader.ts +++ b/tensorboard/plugins/image/tf_image_dashboard/tf-image-loader.ts @@ -14,8 +14,7 @@ limitations under the License. ==============================================================================*/ import {computed, customElement, observe, property} from '@polymer/decorators'; -import {PolymerElement, html} from '@polymer/polymer'; - +import {html, PolymerElement} from '@polymer/polymer'; import * as PolymerDom from '../../../components/polymer/dom'; import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import {Canceller} from '../../../components/tf_backend/canceller'; diff --git a/tensorboard/plugins/mesh/tf_mesh_dashboard/array-buffer-data-provider.ts b/tensorboard/plugins/mesh/tf_mesh_dashboard/array-buffer-data-provider.ts index 27d32b67e0..2498d466fa 100644 --- a/tensorboard/plugins/mesh/tf_mesh_dashboard/array-buffer-data-provider.ts +++ b/tensorboard/plugins/mesh/tf_mesh_dashboard/array-buffer-data-provider.ts @@ -19,8 +19,8 @@ limitations under the License. // TODO(b/135959734): this class must be refactored into base DataProvider and // subclass ArrayBufferDataProvider later. -import {RequestManager} from '../../../components/tf_backend/requestManager'; import {Canceller} from '../../../components/tf_backend/canceller'; +import {RequestManager} from '../../../components/tf_backend/requestManager'; import {getRouter} from '../../../components/tf_backend/router'; /** diff --git a/tensorboard/plugins/mesh/tf_mesh_dashboard/mesh-loader.ts b/tensorboard/plugins/mesh/tf_mesh_dashboard/mesh-loader.ts index 5e538314ca..2d061c69af 100644 --- a/tensorboard/plugins/mesh/tf_mesh_dashboard/mesh-loader.ts +++ b/tensorboard/plugins/mesh/tf_mesh_dashboard/mesh-loader.ts @@ -16,17 +16,15 @@ limitations under the License. * @fileoverview MeshLoader provides UI functionality and placeholder to render * 3D data. */ -import {PolymerElement, html} from '@polymer/polymer'; -import {customElement, computed, observe, property} from '@polymer/decorators'; +import {computed, customElement, observe, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import * as THREE from 'three'; - +import '../../../components/polymer/irons_and_papers'; import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import {RequestManager} from '../../../components/tf_backend/requestManager'; -import {runsColorScale} from '../../../components/tf_color_scale/colorScale'; -import {formatDate} from '../../../components/tf_card_heading/util'; -import '../../../components/polymer/irons_and_papers'; import '../../../components/tf_card_heading/tf-card-heading'; - +import {formatDate} from '../../../components/tf_card_heading/util'; +import {runsColorScale} from '../../../components/tf_color_scale/colorScale'; import { ArrayBufferDataProvider, ErrorCodes, diff --git a/tensorboard/plugins/mesh/tf_mesh_dashboard/tf-mesh-dashboard.ts b/tensorboard/plugins/mesh/tf_mesh_dashboard/tf-mesh-dashboard.ts index 764327a9ae..96f43fb52f 100644 --- a/tensorboard/plugins/mesh/tf_mesh_dashboard/tf-mesh-dashboard.ts +++ b/tensorboard/plugins/mesh/tf_mesh_dashboard/tf-mesh-dashboard.ts @@ -13,26 +13,23 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; -import {customElement, property, computed} from '@polymer/decorators'; +import {computed, customElement, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import * as _ from 'lodash'; - import '../../../components/polymer/irons_and_papers'; import {getTags} from '../../../components/tf_backend/backend'; -import {getRouter} from '../../../components/tf_backend/router'; import {RequestManager} from '../../../components/tf_backend/requestManager'; - +import {getRouter} from '../../../components/tf_backend/router'; import { - RunToTag, categorizeRunTagCombinations, + RunToTag, } from '../../../components/tf_categorization_utils/categorizationUtils'; -import '../../../components/tf_paginated_view/tf-category-paginated-view'; import '../../../components/tf_dashboard_common/dashboard-style'; import '../../../components/tf_dashboard_common/tf-dashboard-layout'; +import '../../../components/tf_paginated_view/tf-category-paginated-view'; import '../../../components/tf_runs_selector/tf-runs-selector'; - -import {TfMeshLoader} from './mesh-loader'; import './mesh-loader'; +import {TfMeshLoader} from './mesh-loader'; @customElement('mesh-dashboard') class MeshDashboard extends PolymerElement { diff --git a/tensorboard/plugins/pr_curve/tf_pr_curve_dashboard/tf-pr-curve-card.ts b/tensorboard/plugins/pr_curve/tf_pr_curve_dashboard/tf-pr-curve-card.ts index 455d284297..c543f0a92d 100644 --- a/tensorboard/plugins/pr_curve/tf_pr_curve_dashboard/tf-pr-curve-card.ts +++ b/tensorboard/plugins/pr_curve/tf_pr_curve_dashboard/tf-pr-curve-card.ts @@ -13,23 +13,21 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {computed, customElement, observe, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; +import * as _ from 'lodash'; +import * as Plottable from 'plottable'; import '../../../components/polymer/irons_and_papers'; - import {Canceller} from '../../../components/tf_backend/canceller'; import {RequestManager} from '../../../components/tf_backend/requestManager'; import {getRouter} from '../../../components/tf_backend/router'; import {addParams} from '../../../components/tf_backend/urlPathHelpers'; import '../../../components/tf_card_heading/tf-card-heading'; -import {RequestDataCallback} from '../../../components/tf_dashboard_common/data-loader-behavior'; import {runsColorScale} from '../../../components/tf_color_scale/colorScale'; +import {RequestDataCallback} from '../../../components/tf_dashboard_common/data-loader-behavior'; import '../../../components/tf_line_chart_data_loader/tf-line-chart-data-loader'; import * as vz_chart_helpers from '../../../components/vz_chart_helpers/vz-chart-helpers'; -import * as _ from 'lodash'; -import * as Plottable from 'plottable'; - type RunItem = string; interface PrCurveDatum { diff --git a/tensorboard/plugins/pr_curve/tf_pr_curve_dashboard/tf-pr-curve-dashboard.ts b/tensorboard/plugins/pr_curve/tf_pr_curve_dashboard/tf-pr-curve-dashboard.ts index 12d617d265..8e44d33c30 100644 --- a/tensorboard/plugins/pr_curve/tf_pr_curve_dashboard/tf-pr-curve-dashboard.ts +++ b/tensorboard/plugins/pr_curve/tf_pr_curve_dashboard/tf-pr-curve-dashboard.ts @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {computed, customElement, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; +import * as _ from 'lodash'; import '../../../components/polymer/irons_and_papers'; import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; - import {getTags} from '../../../components/tf_backend/backend'; import {RequestManager} from '../../../components/tf_backend/requestManager'; import {getRouter} from '../../../components/tf_backend/router'; @@ -29,13 +29,10 @@ import '../../../components/tf_dashboard_common/tf-option-selector'; import '../../../components/tf_paginated_view/tf-category-paginated-view'; import '../../../components/tf_runs_selector/tf-runs-selector'; import * as tf_utils from '../../../components/tf_utils/utils'; - import './tf-pr-curve-card'; import {TfPrCurveCard} from './tf-pr-curve-card'; import './tf-pr-curve-steps-selector'; -import * as _ from 'lodash'; - @customElement('tf-pr-curve-dashboard') // tslint:disable-next-line:no-unused-variable class TfPrCurveDashboard extends LegacyElementMixin(PolymerElement) { diff --git a/tensorboard/plugins/pr_curve/tf_pr_curve_dashboard/tf-pr-curve-steps-selector.ts b/tensorboard/plugins/pr_curve/tf_pr_curve_dashboard/tf-pr-curve-steps-selector.ts index d018cb9c8b..797570cabd 100644 --- a/tensorboard/plugins/pr_curve/tf_pr_curve_dashboard/tf-pr-curve-steps-selector.ts +++ b/tensorboard/plugins/pr_curve/tf_pr_curve_dashboard/tf-pr-curve-steps-selector.ts @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {computed, customElement, observe, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; +import * as _ from 'lodash'; import '../../../components/polymer/irons_and_papers'; import {runsColorScale} from '../../../components/tf_color_scale/colorScale'; -import * as _ from 'lodash'; @customElement('tf-pr-curve-steps-selector') // tslint:disable-next-line:no-unused-variable diff --git a/tensorboard/plugins/profile_redirect/tf_profile_redirect_dashboard/tf-profile-redirect-dashboard.ts b/tensorboard/plugins/profile_redirect/tf_profile_redirect_dashboard/tf-profile-redirect-dashboard.ts index 191fc6cfbd..431e657a46 100644 --- a/tensorboard/plugins/profile_redirect/tf_profile_redirect_dashboard/tf-profile-redirect-dashboard.ts +++ b/tensorboard/plugins/profile_redirect/tf_profile_redirect_dashboard/tf-profile-redirect-dashboard.ts @@ -13,11 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; - -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import {html, PolymerElement} from '@polymer/polymer'; import '../../../components/polymer/irons_and_papers'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; /** * A frontend that directs users to upgrade to the new version of the profile diff --git a/tensorboard/plugins/projector/vz_projector/bundle.ts b/tensorboard/plugins/projector/vz_projector/bundle.ts index 89f3e6b2a6..06f01b31e0 100644 --- a/tensorboard/plugins/projector/vz_projector/bundle.ts +++ b/tensorboard/plugins/projector/vz_projector/bundle.ts @@ -14,15 +14,14 @@ limitations under the License. ==============================================================================*/ import '../../../components/analytics'; import '../../../components/security'; - import './styles'; +import './vz-projector'; import './vz-projector-app'; import './vz-projector-bookmark-panel'; import './vz-projector-dashboard'; import './vz-projector-data-panel'; -import './vz-projector-inspector-panel'; import './vz-projector-input'; +import './vz-projector-inspector-panel'; import './vz-projector-legend'; -import './vz-projector-projections-panel'; import './vz-projector-metadata-card'; -import './vz-projector'; +import './vz-projector-projections-panel'; diff --git a/tensorboard/plugins/projector/vz_projector/data-provider-demo.ts b/tensorboard/plugins/projector/vz_projector/data-provider-demo.ts index 105f70002e..a7afb4ab64 100644 --- a/tensorboard/plugins/projector/vz_projector/data-provider-demo.ts +++ b/tensorboard/plugins/projector/vz_projector/data-provider-demo.ts @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {SpriteAndMetadataInfo, State, DataSet} from './data'; +import {DataSet, SpriteAndMetadataInfo, State} from './data'; import { DataProvider, EmbeddingInfo, diff --git a/tensorboard/plugins/projector/vz_projector/data-provider-proto.ts b/tensorboard/plugins/projector/vz_projector/data-provider-proto.ts index 075d460e4f..2be2ec94b8 100644 --- a/tensorboard/plugins/projector/vz_projector/data-provider-proto.ts +++ b/tensorboard/plugins/projector/vz_projector/data-provider-proto.ts @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import { - DataSet, - DataProto, - State, DataPoint, - SpriteAndMetadataInfo, + DataProto, + DataSet, PointMetadata, + SpriteAndMetadataInfo, + State, } from './data'; import {analyzeMetadata, DataProvider, ProjectorConfig} from './data-provider'; diff --git a/tensorboard/plugins/projector/vz_projector/data-provider-server.ts b/tensorboard/plugins/projector/vz_projector/data-provider-server.ts index 98aaf77c1d..fd8ab52981 100644 --- a/tensorboard/plugins/projector/vz_projector/data-provider-server.ts +++ b/tensorboard/plugins/projector/vz_projector/data-provider-server.ts @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {DataSet, State, SpriteAndMetadataInfo} from './data'; +import {DataSet, SpriteAndMetadataInfo, State} from './data'; import { - retrieveSpriteAndMetadataInfo, - retrieveTensorAsBytes, - EmbeddingInfo, DataProvider, + EmbeddingInfo, ProjectorConfig, + retrieveSpriteAndMetadataInfo, + retrieveTensorAsBytes, } from './data-provider'; import * as logging from './logging'; diff --git a/tensorboard/plugins/projector/vz_projector/data.ts b/tensorboard/plugins/projector/vz_projector/data.ts index e2be3084f2..c20590aeed 100644 --- a/tensorboard/plugins/projector/vz_projector/data.ts +++ b/tensorboard/plugins/projector/vz_projector/data.ts @@ -14,14 +14,13 @@ limitations under the License. ==============================================================================*/ import numeric from 'numeric'; import {UMAP} from 'umap-js'; - import {TSNE} from './bh_tsne'; import {SpriteMetadata} from './data-provider'; -import {CameraDef} from './scatterPlot'; import * as knn from './knn'; -import * as vector from './vector'; import * as logging from './logging'; +import {CameraDef} from './scatterPlot'; import * as util from './util'; +import * as vector from './vector'; export type DistanceFunction = (a: vector.Vector, b: vector.Vector) => number; export type ProjectionComponents3D = [string, string, string]; diff --git a/tensorboard/plugins/projector/vz_projector/knn.ts b/tensorboard/plugins/projector/vz_projector/knn.ts index d1267892ff..c8b2a212e3 100644 --- a/tensorboard/plugins/projector/vz_projector/knn.ts +++ b/tensorboard/plugins/projector/vz_projector/knn.ts @@ -13,11 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as tf from '../../../webapp/third_party/tfjs'; - import {KMin} from './heap'; -import * as vector from './vector'; import * as logging from './logging'; import * as util from './util'; +import * as vector from './vector'; export type NearestEntry = { index: number; diff --git a/tensorboard/plugins/projector/vz_projector/knn_test.ts b/tensorboard/plugins/projector/vz_projector/knn_test.ts index 7585453398..ce7c771b65 100644 --- a/tensorboard/plugins/projector/vz_projector/knn_test.ts +++ b/tensorboard/plugins/projector/vz_projector/knn_test.ts @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {findKNNGPUCosDistNorm, findKNN, NearestEntry, TEST_ONLY} from './knn'; +import {findKNN, findKNNGPUCosDistNorm, NearestEntry, TEST_ONLY} from './knn'; import {cosDistNorm, unit} from './vector'; describe('projector knn test', () => { diff --git a/tensorboard/plugins/projector/vz_projector/projectorScatterPlotAdapter.ts b/tensorboard/plugins/projector/vz_projector/projectorScatterPlotAdapter.ts index 298ffe8ceb..c4e015a251 100644 --- a/tensorboard/plugins/projector/vz_projector/projectorScatterPlotAdapter.ts +++ b/tensorboard/plugins/projector/vz_projector/projectorScatterPlotAdapter.ts @@ -13,23 +13,22 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as THREE from 'three'; - import * as d3 from '../../../webapp/third_party/d3'; import { DataSet, DistanceFunction, Projection, - State, ProjectionComponents3D, + State, } from './data'; +import * as knn from './knn'; import {ProjectorEventContext} from './projectorEventContext'; import {LabelRenderParams} from './renderContext'; import {ScatterPlot} from './scatterPlot'; -import {ScatterPlotVisualizerSprites} from './scatterPlotVisualizerSprites'; import {ScatterPlotVisualizer3DLabels} from './scatterPlotVisualizer3DLabels'; import {ScatterPlotVisualizerCanvasLabels} from './scatterPlotVisualizerCanvasLabels'; import {ScatterPlotVisualizerPolylines} from './scatterPlotVisualizerPolylines'; -import * as knn from './knn'; +import {ScatterPlotVisualizerSprites} from './scatterPlotVisualizerSprites'; import * as vector from './vector'; const LABEL_FONT_SIZE = 10; diff --git a/tensorboard/plugins/projector/vz_projector/scatterPlot.ts b/tensorboard/plugins/projector/vz_projector/scatterPlot.ts index 50191c49cf..9e22efc11d 100644 --- a/tensorboard/plugins/projector/vz_projector/scatterPlot.ts +++ b/tensorboard/plugins/projector/vz_projector/scatterPlot.ts @@ -14,16 +14,15 @@ limitations under the License. ==============================================================================*/ import * as THREE from 'three'; import {OrbitControls} from 'three/examples/jsm/controls/OrbitControls'; - -import * as vector from './vector'; -import * as util from './util'; import {ProjectorEventContext} from './projectorEventContext'; -import {CameraType, RenderContext, LabelRenderParams} from './renderContext'; -import {ScatterPlotVisualizer} from './scatterPlotVisualizer'; +import {CameraType, LabelRenderParams, RenderContext} from './renderContext'; import { ScatterBoundingBox, ScatterPlotRectangleSelector, } from './scatterPlotRectangleSelector'; +import {ScatterPlotVisualizer} from './scatterPlotVisualizer'; +import * as util from './util'; +import * as vector from './vector'; const BACKGROUND_COLOR = 0xffffff; diff --git a/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizer.ts b/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizer.ts index 17fc0aa61e..26326e61a7 100644 --- a/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizer.ts +++ b/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizer.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as THREE from 'three'; - import {RenderContext} from './renderContext'; /** diff --git a/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizer3DLabels.ts b/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizer3DLabels.ts index ca24b1b049..34d8ed0750 100644 --- a/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizer3DLabels.ts +++ b/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizer3DLabels.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as THREE from 'three'; - import {RenderContext} from './renderContext'; import {ScatterPlotVisualizer} from './scatterPlotVisualizer'; import * as util from './util'; diff --git a/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizerCanvasLabels.ts b/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizerCanvasLabels.ts index b25ac7d30d..3e14635512 100644 --- a/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizerCanvasLabels.ts +++ b/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizerCanvasLabels.ts @@ -13,10 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as THREE from 'three'; - import * as d3 from '../../../webapp/third_party/d3'; -import {CameraType, RenderContext} from './renderContext'; import {BoundingBox, CollisionGrid} from './label'; +import {CameraType, RenderContext} from './renderContext'; import {ScatterPlotVisualizer} from './scatterPlotVisualizer'; import * as util from './util'; diff --git a/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizerPolylines.ts b/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizerPolylines.ts index 9724dec7bb..2751dead1b 100644 --- a/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizerPolylines.ts +++ b/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizerPolylines.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as THREE from 'three'; - import {DataSet} from './data'; import {RenderContext} from './renderContext'; import {ScatterPlotVisualizer} from './scatterPlotVisualizer'; diff --git a/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizerSprites.ts b/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizerSprites.ts index 652f377e48..137f236c51 100644 --- a/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizerSprites.ts +++ b/tensorboard/plugins/projector/vz_projector/scatterPlotVisualizerSprites.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as THREE from 'three'; - import {CameraType, RenderContext} from './renderContext'; import {ScatterPlotVisualizer} from './scatterPlotVisualizer'; import * as util from './util'; diff --git a/tensorboard/plugins/projector/vz_projector/util.ts b/tensorboard/plugins/projector/vz_projector/util.ts index 0ec99f6bb8..993047d09c 100644 --- a/tensorboard/plugins/projector/vz_projector/util.ts +++ b/tensorboard/plugins/projector/vz_projector/util.ts @@ -14,10 +14,9 @@ limitations under the License. ==============================================================================*/ import * as THREE from 'three'; import * as tf from '../../../webapp/third_party/tfjs'; - import {DataPoint} from './data'; -import * as vector from './vector'; import * as logging from './logging'; +import * as vector from './vector'; const TASK_DELAY_MS = 200; /** Shuffles the array in-place in O(n) time using Fisher-Yates algorithm. */ diff --git a/tensorboard/plugins/projector/vz_projector/vz-projector-app.ts b/tensorboard/plugins/projector/vz_projector/vz-projector-app.ts index 2590fd091d..f387128a4c 100644 --- a/tensorboard/plugins/projector/vz_projector/vz-projector-app.ts +++ b/tensorboard/plugins/projector/vz_projector/vz-projector-app.ts @@ -13,11 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; - +import {html, PolymerElement} from '@polymer/polymer'; import '../../../components/polymer/irons_and_papers'; - import './styles'; import './vz-projector'; diff --git a/tensorboard/plugins/projector/vz_projector/vz-projector-bookmark-panel.html.ts b/tensorboard/plugins/projector/vz_projector/vz-projector-bookmark-panel.html.ts index fa835742e7..8b69465862 100644 --- a/tensorboard/plugins/projector/vz_projector/vz-projector-bookmark-panel.html.ts +++ b/tensorboard/plugins/projector/vz_projector/vz-projector-bookmark-panel.html.ts @@ -14,9 +14,7 @@ limitations under the License. ==============================================================================*/ import {html} from '@polymer/polymer'; - import '../../../components/polymer/irons_and_papers'; - import './styles'; export const template = html` diff --git a/tensorboard/plugins/projector/vz_projector/vz-projector-bookmark-panel.ts b/tensorboard/plugins/projector/vz_projector/vz-projector-bookmark-panel.ts index 77d25052c6..fccb425b73 100644 --- a/tensorboard/plugins/projector/vz_projector/vz-projector-bookmark-panel.ts +++ b/tensorboard/plugins/projector/vz_projector/vz-projector-bookmark-panel.ts @@ -12,17 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; - +import {PolymerElement} from '@polymer/polymer'; import '../../../components/polymer/irons_and_papers'; import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; - -import {template} from './vz-projector-bookmark-panel.html'; import {State} from './data'; -import {ProjectorEventContext} from './projectorEventContext'; import {DataProvider, EmbeddingInfo} from './data-provider'; import * as logging from './logging'; +import {ProjectorEventContext} from './projectorEventContext'; +import {template} from './vz-projector-bookmark-panel.html'; @customElement('vz-projector-bookmark-panel') class BookmarkPanel extends LegacyElementMixin(PolymerElement) { diff --git a/tensorboard/plugins/projector/vz_projector/vz-projector-dashboard.ts b/tensorboard/plugins/projector/vz_projector/vz-projector-dashboard.ts index ae244ba638..bb0c96cc69 100644 --- a/tensorboard/plugins/projector/vz_projector/vz-projector-dashboard.ts +++ b/tensorboard/plugins/projector/vz_projector/vz-projector-dashboard.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; @customElement('vz-projector-dashboard') class VzProjectorDashboard extends PolymerElement { diff --git a/tensorboard/plugins/projector/vz_projector/vz-projector-data-panel.html.ts b/tensorboard/plugins/projector/vz_projector/vz-projector-data-panel.html.ts index 800f368aee..c65b7563b0 100644 --- a/tensorboard/plugins/projector/vz_projector/vz-projector-data-panel.html.ts +++ b/tensorboard/plugins/projector/vz_projector/vz-projector-data-panel.html.ts @@ -14,9 +14,8 @@ limitations under the License. ==============================================================================*/ import {html} from '@polymer/polymer'; - -import './styles'; import '../../../components/tf_wbr_string/tf-wbr-string'; +import './styles'; export const template = html` diff --git a/tensorboard/plugins/projector/vz_projector/vz-projector-data-panel.ts b/tensorboard/plugins/projector/vz_projector/vz-projector-data-panel.ts index 9c8e66b41e..1eb248b931 100644 --- a/tensorboard/plugins/projector/vz_projector/vz-projector-data-panel.ts +++ b/tensorboard/plugins/projector/vz_projector/vz-projector-data-panel.ts @@ -12,34 +12,32 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +import {customElement, observe, property} from '@polymer/decorators'; import {PolymerElement} from '@polymer/polymer'; -import {customElement, property, observe} from '@polymer/decorators'; - -import * as d3 from '../../../webapp/third_party/d3'; -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import '../../../components/polymer/irons_and_papers'; - -import {template} from './vz-projector-data-panel.html'; -import { - ColorLegendThreshold, - ColorLegendRenderInfo, -} from './vz-projector-legend'; -import './vz-projector-legend'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import * as d3 from '../../../webapp/third_party/d3'; import { - ColumnStats, ColorOption, - SpriteAndMetadataInfo, + ColumnStats, Projection, + SpriteAndMetadataInfo, } from './data'; import { DataProvider, EmbeddingInfo, - ProjectorConfig, parseRawMetadata, parseRawTensors, + ProjectorConfig, } from './data-provider'; import * as knn from './knn'; import * as util from './util'; +import {template} from './vz-projector-data-panel.html'; +import './vz-projector-legend'; +import { + ColorLegendRenderInfo, + ColorLegendThreshold, +} from './vz-projector-legend'; @customElement('vz-projector-data-panel') class DataPanel extends LegacyElementMixin(PolymerElement) { diff --git a/tensorboard/plugins/projector/vz_projector/vz-projector-input.ts b/tensorboard/plugins/projector/vz_projector/vz-projector-input.ts index 23366b2504..84d56b3b6a 100644 --- a/tensorboard/plugins/projector/vz_projector/vz-projector-input.ts +++ b/tensorboard/plugins/projector/vz_projector/vz-projector-input.ts @@ -12,12 +12,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; - -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import {html, PolymerElement} from '@polymer/polymer'; import '../../../components/polymer/irons_and_papers'; - +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import './styles'; export interface InputChangedListener { diff --git a/tensorboard/plugins/projector/vz_projector/vz-projector-inspector-panel.ts b/tensorboard/plugins/projector/vz_projector/vz-projector-inspector-panel.ts index 511928edc2..8791e58e7e 100644 --- a/tensorboard/plugins/projector/vz_projector/vz-projector-inspector-panel.ts +++ b/tensorboard/plugins/projector/vz_projector/vz-projector-inspector-panel.ts @@ -12,20 +12,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement} from '@polymer/polymer'; import {customElement, observe, property} from '@polymer/decorators'; - -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import {PolymerElement} from '@polymer/polymer'; import '../../../components/polymer/irons_and_papers'; - +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import {DistanceFunction, SpriteAndMetadataInfo, State} from './data'; -import {template} from './vz-projector-inspector-panel.html'; -import './vz-projector-input'; -import {dist2color, normalizeDist} from './projectorScatterPlotAdapter'; -import {ProjectorEventContext} from './projectorEventContext'; import * as knn from './knn'; -import * as vector from './vector'; +import {ProjectorEventContext} from './projectorEventContext'; +import {dist2color, normalizeDist} from './projectorScatterPlotAdapter'; import * as util from './util'; +import * as vector from './vector'; +import './vz-projector-input'; +import {template} from './vz-projector-inspector-panel.html'; const LIMIT_RESULTS = 100; const DEFAULT_NEIGHBORS = 100; diff --git a/tensorboard/plugins/projector/vz_projector/vz-projector-legend.ts b/tensorboard/plugins/projector/vz_projector/vz-projector-legend.ts index f5513b2c37..ba8ee3eaeb 100644 --- a/tensorboard/plugins/projector/vz_projector/vz-projector-legend.ts +++ b/tensorboard/plugins/projector/vz_projector/vz-projector-legend.ts @@ -13,11 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, observe, property} from '@polymer/decorators'; - +import {html, PolymerElement} from '@polymer/polymer'; import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; - import './styles'; export interface ColorLegendRenderInfo { diff --git a/tensorboard/plugins/projector/vz_projector/vz-projector-metadata-card.ts b/tensorboard/plugins/projector/vz_projector/vz-projector-metadata-card.ts index d46c7181c7..a4b6056d77 100644 --- a/tensorboard/plugins/projector/vz_projector/vz-projector-metadata-card.ts +++ b/tensorboard/plugins/projector/vz_projector/vz-projector-metadata-card.ts @@ -12,12 +12,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; - -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import {html, PolymerElement} from '@polymer/polymer'; import '../../../components/polymer/irons_and_papers'; - +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import {PointMetadata} from './data'; @customElement('vz-projector-metadata-card') diff --git a/tensorboard/plugins/projector/vz_projector/vz-projector-projections-panel.html.ts b/tensorboard/plugins/projector/vz_projector/vz-projector-projections-panel.html.ts index 189960e546..80477f8701 100644 --- a/tensorboard/plugins/projector/vz_projector/vz-projector-projections-panel.html.ts +++ b/tensorboard/plugins/projector/vz_projector/vz-projector-projections-panel.html.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {html} from '@polymer/polymer'; - import './styles'; export const template = html` diff --git a/tensorboard/plugins/projector/vz_projector/vz-projector-projections-panel.ts b/tensorboard/plugins/projector/vz_projector/vz-projector-projections-panel.ts index 4cc879e972..acd9bca473 100644 --- a/tensorboard/plugins/projector/vz_projector/vz-projector-projections-panel.ts +++ b/tensorboard/plugins/projector/vz_projector/vz-projector-projections-panel.ts @@ -13,14 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement} from '@polymer/polymer'; import {customElement, observe, property} from '@polymer/decorators'; - -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; +import {PolymerElement} from '@polymer/polymer'; import '../../../components/polymer/irons_and_papers'; - -import {template} from './vz-projector-projections-panel.html'; -import './vz-projector-input'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import { DataSet, getProjectionComponents, @@ -33,8 +29,10 @@ import { TSNE_SAMPLE_SIZE, UMAP_SAMPLE_SIZE, } from './data'; -import * as vector from './vector'; import * as util from './util'; +import * as vector from './vector'; +import './vz-projector-input'; +import {template} from './vz-projector-projections-panel.html'; const NUM_PCA_COMPONENTS = 10; diff --git a/tensorboard/plugins/projector/vz_projector/vz-projector.html.ts b/tensorboard/plugins/projector/vz_projector/vz-projector.html.ts index d607ae2a31..dc1da9fd6a 100644 --- a/tensorboard/plugins/projector/vz_projector/vz-projector.html.ts +++ b/tensorboard/plugins/projector/vz_projector/vz-projector.html.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {html} from '@polymer/polymer'; - import './styles'; export const template = html` diff --git a/tensorboard/plugins/projector/vz_projector/vz-projector.ts b/tensorboard/plugins/projector/vz_projector/vz-projector.ts index eea4ecab3a..a9f1f7c677 100644 --- a/tensorboard/plugins/projector/vz_projector/vz-projector.ts +++ b/tensorboard/plugins/projector/vz_projector/vz-projector.ts @@ -12,22 +12,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement} from '@polymer/polymer'; import {customElement, observe, property} from '@polymer/decorators'; +import {PolymerElement} from '@polymer/polymer'; import * as THREE from 'three'; - -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import '../../../components/polymer/irons_and_papers'; - +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import {AnalyticsLogger} from './analyticsLogger'; -import {template} from './vz-projector.html'; import { ColorOption, ColumnStats, - DistanceFunction, DataPoint, DataProto, DataSet, + DistanceFunction, getProjectionComponents, PointMetadata, Projection, @@ -35,21 +32,17 @@ import { State, stateGetAccessorDimensions, } from './data'; -import './vz-projector-metadata-card'; import { - ServingMode, - DataProvider, analyzeMetadata, + DataProvider, EmbeddingInfo, + ServingMode, } from './data-provider'; import {DemoDataProvider} from './data-provider-demo'; import {ProtoDataProvider} from './data-provider-proto'; import {ServerDataProvider} from './data-provider-server'; -import './vz-projector-projections-panel'; -import './vz-projector-bookmark-panel'; -import './vz-projector-data-panel'; -import './vz-projector-inspector-panel'; -import {ProjectorScatterPlotAdapter} from './projectorScatterPlotAdapter'; +import * as knn from './knn'; +import * as logging from './logging'; import { DistanceMetricChangedListener, HoverListener, @@ -57,10 +50,15 @@ import { ProjectorEventContext, SelectionChangedListener, } from './projectorEventContext'; -import * as knn from './knn'; -import * as logging from './logging'; -import * as util from './util'; +import {ProjectorScatterPlotAdapter} from './projectorScatterPlotAdapter'; import {MouseMode} from './scatterPlot'; +import * as util from './util'; +import './vz-projector-bookmark-panel'; +import './vz-projector-data-panel'; +import './vz-projector-inspector-panel'; +import './vz-projector-metadata-card'; +import './vz-projector-projections-panel'; +import {template} from './vz-projector.html'; /** * The minimum number of dimensions the data should have to automatically diff --git a/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-card.ts b/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-card.ts index eb75b492f7..176e6d429e 100644 --- a/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-card.ts +++ b/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-card.ts @@ -13,15 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import '../../../components/polymer/irons_and_papers'; import {RequestManager} from '../../../components/tf_backend/requestManager'; -import {RequestDataCallback} from '../../../components/tf_dashboard_common/data-loader-behavior'; import {getRouter} from '../../../components/tf_backend/router'; import {addParams} from '../../../components/tf_backend/urlPathHelpers'; import '../../../components/tf_card_heading/tf-card-heading'; import {runsColorScale} from '../../../components/tf_color_scale/colorScale'; +import {RequestDataCallback} from '../../../components/tf_dashboard_common/data-loader-behavior'; import '../../../components/tf_dashboard_common/tf-downloader'; import '../../../components/tf_line_chart_data_loader/tf-line-chart-data-loader'; import {ScalarDatum} from '../../../components/vz_chart_helpers/vz-chart-helpers'; diff --git a/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-dashboard.ts b/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-dashboard.ts index 41ebbb8fbc..b5a3394006 100644 --- a/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-dashboard.ts +++ b/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-dashboard.ts @@ -13,8 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {html} from '@polymer/polymer'; import {computed, customElement, observe, property} from '@polymer/decorators'; +import {html} from '@polymer/polymer'; +import * as _ from 'lodash'; import '../../../components/polymer/irons_and_papers'; import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import {getTags} from '../../../components/tf_backend/backend'; @@ -35,7 +36,6 @@ import {FeatureFlags} from '../../../webapp/feature_flag/types'; import './tf-scalar-card'; import {TfScalarCard} from './tf-scalar-card'; import './tf-smoothing-input'; -import * as _ from 'lodash'; /** * A frontend that displays a set of tf-scalar-charts, each of which diff --git a/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-smoothing-input.ts b/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-smoothing-input.ts index 70854729fc..9972c2c864 100644 --- a/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-smoothing-input.ts +++ b/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-smoothing-input.ts @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; import {customElement, property} from '@polymer/decorators'; -import '../../../components/polymer/irons_and_papers'; +import {html, PolymerElement} from '@polymer/polymer'; import * as _ from 'lodash'; +import '../../../components/polymer/irons_and_papers'; /** * tf-smoothing-input creates an input component for exponential smoothing. diff --git a/tensorboard/plugins/text/tf_text_dashboard/tf-text-dashboard.ts b/tensorboard/plugins/text/tf_text_dashboard/tf-text-dashboard.ts index 32ccad09d0..245e2c2912 100644 --- a/tensorboard/plugins/text/tf_text_dashboard/tf-text-dashboard.ts +++ b/tensorboard/plugins/text/tf_text_dashboard/tf-text-dashboard.ts @@ -13,18 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; -import {customElement, property, computed} from '@polymer/decorators'; +import {computed, customElement, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import * as _ from 'lodash'; - -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import '../../../components/polymer/irons_and_papers'; - +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import {getTags} from '../../../components/tf_backend/backend'; import {RequestManager} from '../../../components/tf_backend/requestManager'; -import {categorizeRunTagCombinations} from '../../../components/tf_categorization_utils/categorizationUtils'; import {getRouter} from '../../../components/tf_backend/router'; - +import {categorizeRunTagCombinations} from '../../../components/tf_categorization_utils/categorizationUtils'; import '../../../components/tf_categorization_utils/tf-tag-filterer'; import '../../../components/tf_dashboard_common/dashboard-style'; import '../../../components/tf_dashboard_common/tf-dashboard-layout'; diff --git a/tensorboard/plugins/text/tf_text_dashboard/tf-text-loader.ts b/tensorboard/plugins/text/tf_text_dashboard/tf-text-loader.ts index c521d445ef..c99011633d 100644 --- a/tensorboard/plugins/text/tf_text_dashboard/tf-text-loader.ts +++ b/tensorboard/plugins/text/tf_text_dashboard/tf-text-loader.ts @@ -13,21 +13,19 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PolymerElement, html} from '@polymer/polymer'; -import {customElement, property, observe, computed} from '@polymer/decorators'; +import {computed, customElement, observe, property} from '@polymer/decorators'; +import {html, PolymerElement} from '@polymer/polymer'; import * as d3 from 'd3'; - -import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import '../../../components/polymer/irons_and_papers'; +import {LegacyElementMixin} from '../../../components/polymer/legacy_element_mixin'; import {Canceller} from '../../../components/tf_backend/canceller'; -import {addParams} from '../../../components/tf_backend/urlPathHelpers'; -import {getRouter} from '../../../components/tf_backend/router'; import {RequestManager} from '../../../components/tf_backend/requestManager'; -import {runsColorScale} from '../../../components/tf_color_scale/colorScale'; - -import '../../../components/tf_markdown_view/tf-markdown-view'; +import {getRouter} from '../../../components/tf_backend/router'; +import {addParams} from '../../../components/tf_backend/urlPathHelpers'; import '../../../components/tf_card_heading/tf-card-heading'; +import {runsColorScale} from '../../../components/tf_color_scale/colorScale'; import '../../../components/tf_dashboard_common/scrollbar-style'; +import '../../../components/tf_markdown_view/tf-markdown-view'; // tf-text-loader displays markdown text data from the Text plugin. @customElement('tf-text-loader') diff --git a/tensorboard/webapp/alert/actions/index.ts b/tensorboard/webapp/alert/actions/index.ts index 5f2236a2a3..cf6f185432 100644 --- a/tensorboard/webapp/alert/actions/index.ts +++ b/tensorboard/webapp/alert/actions/index.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {createAction, props} from '@ngrx/store'; - import {AlertReport} from '../types'; /** diff --git a/tensorboard/webapp/alert/alert_action_module.ts b/tensorboard/webapp/alert/alert_action_module.ts index 9acdad37f3..360440e1ed 100644 --- a/tensorboard/webapp/alert/alert_action_module.ts +++ b/tensorboard/webapp/alert/alert_action_module.ts @@ -14,10 +14,10 @@ limitations under the License. ==============================================================================*/ import { Inject, + InjectionToken, ModuleWithProviders, NgModule, Optional, - InjectionToken, } from '@angular/core'; import {Action, ActionCreator, Creator} from '@ngrx/store'; import {AlertReport} from './types'; diff --git a/tensorboard/webapp/alert/store/alert_reducers_test.ts b/tensorboard/webapp/alert/store/alert_reducers_test.ts index 9824af5c5c..6eef7713ea 100644 --- a/tensorboard/webapp/alert/store/alert_reducers_test.ts +++ b/tensorboard/webapp/alert/store/alert_reducers_test.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {createAction} from '@ngrx/store'; - import * as alertActions from '../actions'; import * as alertReducers from './alert_reducers'; import {buildAlertState} from './testing'; diff --git a/tensorboard/webapp/alert/store/alert_selectors.ts b/tensorboard/webapp/alert/store/alert_selectors.ts index 07ae076901..0a74ba5d3c 100644 --- a/tensorboard/webapp/alert/store/alert_selectors.ts +++ b/tensorboard/webapp/alert/store/alert_selectors.ts @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {createSelector, createFeatureSelector} from '@ngrx/store'; +import {createFeatureSelector, createSelector} from '@ngrx/store'; import {AlertInfo} from '../types'; -import {AlertState, State, ALERT_FEATURE_KEY} from './alert_types'; +import {AlertState, ALERT_FEATURE_KEY, State} from './alert_types'; const selectAlertState = createFeatureSelector( ALERT_FEATURE_KEY diff --git a/tensorboard/webapp/alert/store/testing.ts b/tensorboard/webapp/alert/store/testing.ts index cf3cb8e159..9ffc1cf75d 100644 --- a/tensorboard/webapp/alert/store/testing.ts +++ b/tensorboard/webapp/alert/store/testing.ts @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {ALERT_FEATURE_KEY, AlertState, State} from './alert_types'; +import {AlertState, ALERT_FEATURE_KEY, State} from './alert_types'; export function buildAlertState(override: Partial): AlertState { return { diff --git a/tensorboard/webapp/alert/views/alert_display_snackbar_container.ts b/tensorboard/webapp/alert/views/alert_display_snackbar_container.ts index ec891d1f02..cd57042b42 100644 --- a/tensorboard/webapp/alert/views/alert_display_snackbar_container.ts +++ b/tensorboard/webapp/alert/views/alert_display_snackbar_container.ts @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {ChangeDetectionStrategy, Component, Inject} from '@angular/core'; -import {MAT_SNACK_BAR_DATA, MatSnackBarRef} from '@angular/material/snack-bar'; -import {State} from '../../app_state'; -import {AlertInfo} from '../types'; +import {MatSnackBarRef, MAT_SNACK_BAR_DATA} from '@angular/material/snack-bar'; import {Store} from '@ngrx/store'; +import {State} from '../../app_state'; import {splitByURL} from '../../util/string'; +import {AlertInfo} from '../types'; @Component({ selector: 'alert-display-snackbar', diff --git a/tensorboard/webapp/alert/views/alert_snackbar_container.ts b/tensorboard/webapp/alert/views/alert_snackbar_container.ts index fc2cb7e15b..ebd8273586 100644 --- a/tensorboard/webapp/alert/views/alert_snackbar_container.ts +++ b/tensorboard/webapp/alert/views/alert_snackbar_container.ts @@ -22,11 +22,10 @@ import {MatSnackBar} from '@angular/material/snack-bar'; import {Store} from '@ngrx/store'; import {Subject} from 'rxjs'; import {filter, takeUntil} from 'rxjs/operators'; - -import {State} from '../store/alert_types'; import {getLatestAlert} from '../../selectors'; -import {AlertDisplaySnackbarContainer} from './alert_display_snackbar_container'; +import {State} from '../store/alert_types'; import {AlertInfo} from '../types'; +import {AlertDisplaySnackbarContainer} from './alert_display_snackbar_container'; /** * Renders alerts in a 'snackbar' to indicate them to the user. diff --git a/tensorboard/webapp/alert/views/alert_snackbar_module.ts b/tensorboard/webapp/alert/views/alert_snackbar_module.ts index dbdf2c46f0..5aa90179fb 100644 --- a/tensorboard/webapp/alert/views/alert_snackbar_module.ts +++ b/tensorboard/webapp/alert/views/alert_snackbar_module.ts @@ -12,13 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; import {MatButtonModule} from '@angular/material/button'; import {MatSnackBarModule} from '@angular/material/snack-bar'; - -import {AlertSnackbarContainer} from './alert_snackbar_container'; import {AlertDisplaySnackbarContainer} from './alert_display_snackbar_container'; +import {AlertSnackbarContainer} from './alert_snackbar_container'; /** * Provides the 'alert snackbar' view. diff --git a/tensorboard/webapp/alert/views/alert_snackbar_test.ts b/tensorboard/webapp/alert/views/alert_snackbar_test.ts index 731de599f4..be075cdd21 100644 --- a/tensorboard/webapp/alert/views/alert_snackbar_test.ts +++ b/tensorboard/webapp/alert/views/alert_snackbar_test.ts @@ -14,16 +14,16 @@ limitations under the License. ==============================================================================*/ import {OverlayContainer} from '@angular/cdk/overlay'; import {TestBed} from '@angular/core/testing'; +import {MatButtonModule} from '@angular/material/button'; import {MatSnackBar, MatSnackBarModule} from '@angular/material/snack-bar'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Action, createAction, props, Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; -import {AlertSnackbarContainer} from './alert_snackbar_container'; -import {State} from '../store'; +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import * as selectors from '../../selectors'; -import {buildStateFromAlertState, buildAlertState} from '../store/testing'; +import {State} from '../store'; +import {buildAlertState, buildStateFromAlertState} from '../store/testing'; import {AlertDisplaySnackbarContainer} from './alert_display_snackbar_container'; -import {MatButtonModule} from '@angular/material/button'; +import {AlertSnackbarContainer} from './alert_snackbar_container'; const testAction = createAction('[Test] Action Occurred'); const testActionWithProps = createAction( diff --git a/tensorboard/webapp/app_module.ts b/tensorboard/webapp/app_module.ts index 21bec8ef23..c7a10685c3 100644 --- a/tensorboard/webapp/app_module.ts +++ b/tensorboard/webapp/app_module.ts @@ -15,7 +15,6 @@ limitations under the License. import {NgModule} from '@angular/core'; import {BrowserModule} from '@angular/platform-browser'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; - import {PluginApiHostModule} from '../components/experimental/plugin_util/plugin_api_host_module'; import {AlertModule} from './alert/alert_module'; import {AlertSnackbarModule} from './alert/views/alert_snackbar_module'; diff --git a/tensorboard/webapp/app_routing/actions/app_routing_actions.ts b/tensorboard/webapp/app_routing/actions/app_routing_actions.ts index e9c428045d..3a55571152 100644 --- a/tensorboard/webapp/app_routing/actions/app_routing_actions.ts +++ b/tensorboard/webapp/app_routing/actions/app_routing_actions.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {createAction, props} from '@ngrx/store'; - import {Navigation, Route, RouteKind} from '../types'; /** diff --git a/tensorboard/webapp/app_routing/app_root.ts b/tensorboard/webapp/app_routing/app_root.ts index be97930466..b33a63e5ae 100644 --- a/tensorboard/webapp/app_routing/app_root.ts +++ b/tensorboard/webapp/app_routing/app_root.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Injectable} from '@angular/core'; - import {Location} from './location'; @Injectable() diff --git a/tensorboard/webapp/app_routing/app_root_module.ts b/tensorboard/webapp/app_routing/app_root_module.ts index be3bb5984d..f1c614d8b9 100644 --- a/tensorboard/webapp/app_routing/app_root_module.ts +++ b/tensorboard/webapp/app_routing/app_root_module.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - import {AppRootProvider} from './app_root'; import {LocationModule} from './location_module'; diff --git a/tensorboard/webapp/app_routing/app_root_test.ts b/tensorboard/webapp/app_routing/app_root_test.ts index 831c29b355..9d30311fd9 100644 --- a/tensorboard/webapp/app_routing/app_root_test.ts +++ b/tensorboard/webapp/app_routing/app_root_test.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {TestBed} from '@angular/core/testing'; - import {AppRootProvider, TestableAppRootProvider} from './app_root'; import {Location} from './location'; diff --git a/tensorboard/webapp/app_routing/app_routing_module.ts b/tensorboard/webapp/app_routing/app_routing_module.ts index 7b54923833..ab35b373f2 100644 --- a/tensorboard/webapp/app_routing/app_routing_module.ts +++ b/tensorboard/webapp/app_routing/app_routing_module.ts @@ -15,10 +15,9 @@ limitations under the License. import {NgModule} from '@angular/core'; import {EffectsModule} from '@ngrx/effects'; import {StoreModule} from '@ngrx/store'; - import {AppRootModule} from './app_root_module'; -import {AppRoutingEffects} from './effects'; import {DirtyUpdatesRegistryModule} from './dirty_updates_registry_module'; +import {AppRoutingEffects} from './effects'; import {LocationModule} from './location_module'; import {ProgrammaticalNavigationModule} from './programmatical_navigation_module'; import {RouteRegistryModule} from './route_registry_module'; diff --git a/tensorboard/webapp/app_routing/deep_link_provider.ts b/tensorboard/webapp/app_routing/deep_link_provider.ts index 8ee9236180..88865326d2 100644 --- a/tensorboard/webapp/app_routing/deep_link_provider.ts +++ b/tensorboard/webapp/app_routing/deep_link_provider.ts @@ -15,9 +15,7 @@ limitations under the License. import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; import {Observable} from 'rxjs'; - import {State} from '../app_state'; - import {SerializableQueryParams} from './types'; /** diff --git a/tensorboard/webapp/app_routing/dirty_updates_registry_module.ts b/tensorboard/webapp/app_routing/dirty_updates_registry_module.ts index 24173a198a..a7baa0b5a5 100644 --- a/tensorboard/webapp/app_routing/dirty_updates_registry_module.ts +++ b/tensorboard/webapp/app_routing/dirty_updates_registry_module.ts @@ -13,10 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Inject, ModuleWithProviders, NgModule, Optional} from '@angular/core'; - import { - DIRTY_UPDATES_TOKEN, DirtyUpdatesSelector, + DIRTY_UPDATES_TOKEN, } from './dirty_updates_registry_types'; @NgModule() diff --git a/tensorboard/webapp/app_routing/dirty_updates_registry_module_test.ts b/tensorboard/webapp/app_routing/dirty_updates_registry_module_test.ts index d1408066ec..89990ad6b4 100644 --- a/tensorboard/webapp/app_routing/dirty_updates_registry_module_test.ts +++ b/tensorboard/webapp/app_routing/dirty_updates_registry_module_test.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {TestBed} from '@angular/core/testing'; import {createSelector, Selector} from '@ngrx/store'; - import {DirtyUpdatesRegistryModule} from './dirty_updates_registry_module'; import {DirtyUpdates} from './types'; diff --git a/tensorboard/webapp/app_routing/dirty_updates_registry_types.ts b/tensorboard/webapp/app_routing/dirty_updates_registry_types.ts index 3659eb44bb..702222f617 100644 --- a/tensorboard/webapp/app_routing/dirty_updates_registry_types.ts +++ b/tensorboard/webapp/app_routing/dirty_updates_registry_types.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {InjectionToken} from '@angular/core'; import {Selector} from '@ngrx/store'; - import {DirtyUpdates} from './types'; export type DirtyUpdatesSelector = Selector; diff --git a/tensorboard/webapp/app_routing/effects/app_routing_effects.ts b/tensorboard/webapp/app_routing/effects/app_routing_effects.ts index 1a73a7eaa8..b6eef1f06a 100644 --- a/tensorboard/webapp/app_routing/effects/app_routing_effects.ts +++ b/tensorboard/webapp/app_routing/effects/app_routing_effects.ts @@ -27,7 +27,6 @@ import { tap, withLatestFrom, } from 'rxjs/operators'; - import {State} from '../../app_state'; import {getEnabledTimeNamespacedState} from '../../feature_flag/store/feature_flag_selectors'; import { @@ -50,8 +49,8 @@ import {ProgrammaticalNavigationModule} from '../programmatical_navigation_modul import {RouteConfigs} from '../route_config'; import {RouteRegistryModule} from '../route_registry_module'; import { - getActiveRoute, getActiveNamespaceId, + getActiveRoute, } from '../store/app_routing_selectors'; import {Navigation, Route, RouteKind, RouteParams} from '../types'; diff --git a/tensorboard/webapp/app_routing/effects/app_routing_effects_test.ts b/tensorboard/webapp/app_routing/effects/app_routing_effects_test.ts index c6ba4176f1..a2ac96b22f 100644 --- a/tensorboard/webapp/app_routing/effects/app_routing_effects_test.ts +++ b/tensorboard/webapp/app_routing/effects/app_routing_effects_test.ts @@ -19,13 +19,13 @@ import {provideMockActions} from '@ngrx/effects/testing'; import {Action, createAction, createSelector, props, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {of, ReplaySubject} from 'rxjs'; - import {State} from '../../app_state'; import {getEnabledTimeNamespacedState} from '../../feature_flag/store/feature_flag_selectors'; import * as actions from '../actions'; import {AppRootProvider, TestableAppRootProvider} from '../app_root'; -import {Location} from '../location'; import {DirtyUpdatesRegistryModule} from '../dirty_updates_registry_module'; +import {getRouteId} from '../internal_utils'; +import {Location} from '../location'; import { NavigateToCompare, NavigateToExperiments, @@ -44,9 +44,7 @@ import { RouteKind, SerializableQueryParams, } from '../types'; - import {AppRoutingEffects, TEST_ONLY} from './app_routing_effects'; -import {getRouteId} from '../internal_utils'; @Component({selector: 'test', template: ''}) class TestableComponent {} diff --git a/tensorboard/webapp/app_routing/location.ts b/tensorboard/webapp/app_routing/location.ts index 015f50bd8f..ae1332666f 100644 --- a/tensorboard/webapp/app_routing/location.ts +++ b/tensorboard/webapp/app_routing/location.ts @@ -15,7 +15,6 @@ limitations under the License. import {Injectable} from '@angular/core'; import {fromEvent, Observable} from 'rxjs'; import {map} from 'rxjs/operators'; - import {createURLSearchParamsFromSerializableQueryParams} from './internal_utils'; import {Navigation, Route, SerializableQueryParams} from './types'; diff --git a/tensorboard/webapp/app_routing/programmatical_navigation_module.ts b/tensorboard/webapp/app_routing/programmatical_navigation_module.ts index 1d5df2df1e..64e5f5df99 100644 --- a/tensorboard/webapp/app_routing/programmatical_navigation_module.ts +++ b/tensorboard/webapp/app_routing/programmatical_navigation_module.ts @@ -14,10 +14,9 @@ limitations under the License. ==============================================================================*/ import {Inject, ModuleWithProviders, NgModule, Optional} from '@angular/core'; import {Action, ActionCreator, Creator} from '@ngrx/store'; - import { - NAVIGATION_PROVIDER, NavigationLambda, + NAVIGATION_PROVIDER, ProgrammaticalNavigation, } from './programmatical_navigation_types'; diff --git a/tensorboard/webapp/app_routing/programmatical_navigation_module_test.ts b/tensorboard/webapp/app_routing/programmatical_navigation_module_test.ts index 78495da524..19226f1615 100644 --- a/tensorboard/webapp/app_routing/programmatical_navigation_module_test.ts +++ b/tensorboard/webapp/app_routing/programmatical_navigation_module_test.ts @@ -15,7 +15,6 @@ limitations under the License. import {TestBed} from '@angular/core/testing'; import {createAction} from '@ngrx/store'; - import { NavigateToCompare, NavigateToExperiments, diff --git a/tensorboard/webapp/app_routing/programmatical_navigation_types.ts b/tensorboard/webapp/app_routing/programmatical_navigation_types.ts index 2f413ae83b..f0ecfb56fb 100644 --- a/tensorboard/webapp/app_routing/programmatical_navigation_types.ts +++ b/tensorboard/webapp/app_routing/programmatical_navigation_types.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {InjectionToken} from '@angular/core'; import {Action, ActionCreator, Creator} from '@ngrx/store'; - import {ExperimentRouteParams, RouteKind} from './types'; export const NAVIGATION_PROVIDER = new InjectionToken( diff --git a/tensorboard/webapp/app_routing/route_config_test.ts b/tensorboard/webapp/app_routing/route_config_test.ts index 31a6c6b16f..2c6f359f94 100644 --- a/tensorboard/webapp/app_routing/route_config_test.ts +++ b/tensorboard/webapp/app_routing/route_config_test.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {Component} from '@angular/core'; - import {RouteConfigs, RouteMatch} from './route_config'; import {ConcreteRouteDef, RedirectionRouteDef} from './route_config_types'; import {Navigation, RouteKind} from './types'; diff --git a/tensorboard/webapp/app_routing/route_config_types.ts b/tensorboard/webapp/app_routing/route_config_types.ts index 1f6447ba5b..705712b188 100644 --- a/tensorboard/webapp/app_routing/route_config_types.ts +++ b/tensorboard/webapp/app_routing/route_config_types.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Component, Type} from '@angular/core'; - import {DeepLinkProvider} from './deep_link_provider'; import {RouteKind, SerializableQueryParams} from './types'; diff --git a/tensorboard/webapp/app_routing/route_contexted_reducer_helper.ts b/tensorboard/webapp/app_routing/route_contexted_reducer_helper.ts index 44e89c800b..2c3103c2a7 100644 --- a/tensorboard/webapp/app_routing/route_contexted_reducer_helper.ts +++ b/tensorboard/webapp/app_routing/route_contexted_reducer_helper.ts @@ -37,7 +37,6 @@ limitations under the License. */ import {ActionReducer, createReducer, on} from '@ngrx/store'; - import {navigated} from './actions'; import {getRouteId} from './internal_utils'; import {Route} from './types'; diff --git a/tensorboard/webapp/app_routing/route_contexted_reducer_helper_test.ts b/tensorboard/webapp/app_routing/route_contexted_reducer_helper_test.ts index 54c580e9ae..be3ea228d0 100644 --- a/tensorboard/webapp/app_routing/route_contexted_reducer_helper_test.ts +++ b/tensorboard/webapp/app_routing/route_contexted_reducer_helper_test.ts @@ -23,7 +23,6 @@ import { StoreModule, } from '@ngrx/store'; import {firstValueFrom} from 'rxjs'; - import {composeReducers} from '../util/ngrx'; import {navigated} from './actions'; import { diff --git a/tensorboard/webapp/app_routing/route_registry_module.ts b/tensorboard/webapp/app_routing/route_registry_module.ts index bb5d6550ae..fc1fcbdd42 100644 --- a/tensorboard/webapp/app_routing/route_registry_module.ts +++ b/tensorboard/webapp/app_routing/route_registry_module.ts @@ -20,7 +20,6 @@ import { Optional, Type, } from '@angular/core'; - import {RouteConfigs} from './route_config'; import {isConcreteRouteDef, RouteDef} from './route_config_types'; import {ROUTE_CONFIGS_TOKEN} from './route_registry_types'; diff --git a/tensorboard/webapp/app_routing/route_registry_module_test.ts b/tensorboard/webapp/app_routing/route_registry_module_test.ts index 0811bc5168..206bf4233c 100644 --- a/tensorboard/webapp/app_routing/route_registry_module_test.ts +++ b/tensorboard/webapp/app_routing/route_registry_module_test.ts @@ -15,7 +15,6 @@ limitations under the License. import {Component} from '@angular/core'; import {TestBed} from '@angular/core/testing'; - import {RouteRegistryModule} from './route_registry_module'; import {RouteKind} from './types'; diff --git a/tensorboard/webapp/app_routing/store/app_routing_reducers_test.ts b/tensorboard/webapp/app_routing/store/app_routing_reducers_test.ts index 9150ab3c7e..6fa95b8a07 100644 --- a/tensorboard/webapp/app_routing/store/app_routing_reducers_test.ts +++ b/tensorboard/webapp/app_routing/store/app_routing_reducers_test.ts @@ -16,7 +16,6 @@ limitations under the License. import * as actions from '../actions'; import {buildRoute} from '../testing'; import {RouteKind} from '../types'; - import * as appRoutingReducers from './app_routing_reducers'; import {buildAppRoutingState} from './testing'; diff --git a/tensorboard/webapp/app_routing/store/app_routing_selectors.ts b/tensorboard/webapp/app_routing/store/app_routing_selectors.ts index cee21eb311..6754d151e5 100644 --- a/tensorboard/webapp/app_routing/store/app_routing_selectors.ts +++ b/tensorboard/webapp/app_routing/store/app_routing_selectors.ts @@ -13,23 +13,21 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {createFeatureSelector, createSelector} from '@ngrx/store'; - +import {ExperimentAlias} from '../../experiments/types'; import { getExperimentIdsFromRouteParams, getRouteId as getRouteIdFromKindAndParams, } from '../internal_utils'; +import { + getCompareExperimentIdAliasSpec, + getCompareExperimentIdAliasWithNumberSpec, +} from '../store_only_utils'; import {CompareRouteParams, Route, RouteKind} from '../types'; - import { - APP_ROUTING_FEATURE_KEY, AppRoutingState, + APP_ROUTING_FEATURE_KEY, State, } from './app_routing_types'; -import { - getCompareExperimentIdAliasSpec, - getCompareExperimentIdAliasWithNumberSpec, -} from '../store_only_utils'; -import {ExperimentAlias} from '../../experiments/types'; const getAppRoutingState = createFeatureSelector( APP_ROUTING_FEATURE_KEY diff --git a/tensorboard/webapp/app_routing/store/app_routing_selectors_test.ts b/tensorboard/webapp/app_routing/store/app_routing_selectors_test.ts index 10a6ed4789..d57c6f8cbf 100644 --- a/tensorboard/webapp/app_routing/store/app_routing_selectors_test.ts +++ b/tensorboard/webapp/app_routing/store/app_routing_selectors_test.ts @@ -15,7 +15,6 @@ limitations under the License. import {buildRoute} from '../testing'; import {RouteKind} from '../types'; - import * as selectors from './app_routing_selectors'; import {buildAppRoutingState, buildStateFromAppRoutingState} from './testing'; diff --git a/tensorboard/webapp/app_routing/store/testing.ts b/tensorboard/webapp/app_routing/store/testing.ts index a599729c2f..1919a943e8 100644 --- a/tensorboard/webapp/app_routing/store/testing.ts +++ b/tensorboard/webapp/app_routing/store/testing.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import { - APP_ROUTING_FEATURE_KEY, AppRoutingState, + APP_ROUTING_FEATURE_KEY, State, } from './app_routing_types'; diff --git a/tensorboard/webapp/app_routing/testing.ts b/tensorboard/webapp/app_routing/testing.ts index 354407da1a..ddc898b21c 100644 --- a/tensorboard/webapp/app_routing/testing.ts +++ b/tensorboard/webapp/app_routing/testing.ts @@ -13,15 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Injectable, Provider} from '@angular/core'; - import {of} from 'rxjs'; - import {navigated, NavigatedPayload} from './actions'; +import {getRouteId} from './internal_utils'; import {Location} from './location'; import {Route, RouteKind} from './types'; -import {getRouteId} from './internal_utils'; - export function buildRoute(routeOverride: Partial = {}): Route { return { routeKind: RouteKind.EXPERIMENTS, diff --git a/tensorboard/webapp/app_routing/views/app_routing_view_module.ts b/tensorboard/webapp/app_routing/views/app_routing_view_module.ts index 5a2e09eb0d..67d7434857 100644 --- a/tensorboard/webapp/app_routing/views/app_routing_view_module.ts +++ b/tensorboard/webapp/app_routing/views/app_routing_view_module.ts @@ -14,14 +14,12 @@ limitations under the License. ==============================================================================*/ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - +import {AppRootModule} from '../app_root_module'; +import {LocationModule} from '../location_module'; import {RouteRegistryModule} from '../route_registry_module'; - import {RouterLinkDirectiveContainer} from './router_link_directive_container'; import {RouterOutletComponent} from './router_outlet_component'; import {RouterOutletContainer} from './router_outlet_container'; -import {LocationModule} from '../location_module'; -import {AppRootModule} from '../app_root_module'; @NgModule({ imports: [CommonModule, AppRootModule, LocationModule, RouteRegistryModule], diff --git a/tensorboard/webapp/app_routing/views/router_link_directive_container.ts b/tensorboard/webapp/app_routing/views/router_link_directive_container.ts index 2947641232..8ad212c8a1 100644 --- a/tensorboard/webapp/app_routing/views/router_link_directive_container.ts +++ b/tensorboard/webapp/app_routing/views/router_link_directive_container.ts @@ -12,15 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import { - Directive, - HostBinding, - HostListener, - Inject, - Input, -} from '@angular/core'; +import {Directive, HostBinding, HostListener, Input} from '@angular/core'; import {Store} from '@ngrx/store'; - import {State} from '../../app_state'; import {navigationRequested} from '../actions'; import {AppRootProvider} from '../app_root'; diff --git a/tensorboard/webapp/app_routing/views/router_link_test.ts b/tensorboard/webapp/app_routing/views/router_link_test.ts index 2b8beb46dd..c6ab9d670b 100644 --- a/tensorboard/webapp/app_routing/views/router_link_test.ts +++ b/tensorboard/webapp/app_routing/views/router_link_test.ts @@ -19,12 +19,10 @@ import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Action, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; - import {State} from '../../app_state'; import {navigationRequested} from '../actions'; import {AppRootProvider, TestableAppRootProvider} from '../app_root'; import {LocationModule} from '../location_module'; - import {RouterLinkDirectiveContainer} from './router_link_directive_container'; @Component({ diff --git a/tensorboard/webapp/app_routing/views/router_outlet_container.ts b/tensorboard/webapp/app_routing/views/router_outlet_container.ts index 432fc76800..0ca368f7f7 100644 --- a/tensorboard/webapp/app_routing/views/router_outlet_container.ts +++ b/tensorboard/webapp/app_routing/views/router_outlet_container.ts @@ -16,7 +16,6 @@ import {ChangeDetectionStrategy, Component} from '@angular/core'; import {Store} from '@ngrx/store'; import {combineLatest} from 'rxjs'; import {map} from 'rxjs/operators'; - import {State} from '../../app_state'; import {getRouteId} from '../internal_utils'; import {RouteRegistryModule} from '../route_registry_module'; diff --git a/tensorboard/webapp/app_routing/views/router_outlet_test.ts b/tensorboard/webapp/app_routing/views/router_outlet_test.ts index b4c94f1150..cd457e88c2 100644 --- a/tensorboard/webapp/app_routing/views/router_outlet_test.ts +++ b/tensorboard/webapp/app_routing/views/router_outlet_test.ts @@ -20,7 +20,6 @@ import {BrowserDynamicTestingModule} from '@angular/platform-browser-dynamic/tes import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; - import {State} from '../../app_state'; import {RouteRegistryModule} from '../route_registry_module'; import { @@ -29,7 +28,6 @@ import { } from '../store/app_routing_selectors'; import {buildRoute} from '../testing'; import {RouteKind} from '../types'; - import {RouterOutletComponent} from './router_outlet_component'; import {RouterOutletContainer} from './router_outlet_container'; diff --git a/tensorboard/webapp/app_state.ts b/tensorboard/webapp/app_state.ts index bda49267ae..b5b4f4c47c 100644 --- a/tensorboard/webapp/app_state.ts +++ b/tensorboard/webapp/app_state.ts @@ -17,13 +17,13 @@ import {State as AppRoutingState} from './app_routing/store/app_routing_types'; import {State as CoreState} from './core/store/core_types'; import {State as ExperimentsState} from './experiments/store/experiments_types'; import {State as FeatureFlagState} from './feature_flag/store/feature_flag_types'; +import {State as HparamsState} from './hparams/types'; import {State as MetricsState} from './metrics/store/metrics_types'; +import {State as NotificationState} from './notification_center/_redux/notification_center_types'; import {State as NpmiState} from './plugins/npmi/store/npmi_types'; +import {State as TextState} from './plugins/text_v2/store/text_types'; import {State as RunsState} from './runs/store/runs_types'; import {State as SettingsState} from './settings'; -import {State as TextState} from './plugins/text_v2/store/text_types'; -import {State as NotificationState} from './notification_center/_redux/notification_center_types'; -import {State as HparamsState} from './hparams/types'; export type State = AppRoutingState & CoreState & diff --git a/tensorboard/webapp/bootstrap.ts b/tensorboard/webapp/bootstrap.ts index 3a68384efb..fb27d5ada4 100644 --- a/tensorboard/webapp/bootstrap.ts +++ b/tensorboard/webapp/bootstrap.ts @@ -18,7 +18,6 @@ limitations under the License. import '@angular/localize/init'; import {platformBrowser} from '@angular/platform-browser'; import 'zone.js/dist/zone.js'; // Angular runtime dep - import {AppModule} from './app_module'; // Bootstrap needs to happen after body is ready but we cannot reliably diff --git a/tensorboard/webapp/core/actions/core_actions.ts b/tensorboard/webapp/core/actions/core_actions.ts index d7a14b3caa..3c70bdf014 100644 --- a/tensorboard/webapp/core/actions/core_actions.ts +++ b/tensorboard/webapp/core/actions/core_actions.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {createAction, props} from '@ngrx/store'; import {Environment, PluginId, PluginsListing} from '../../types/api'; - import {PluginsListFailureCode, Run, RunId} from '../types'; /** diff --git a/tensorboard/webapp/core/core_module.ts b/tensorboard/webapp/core/core_module.ts index d8117d5093..f37fd5dd17 100644 --- a/tensorboard/webapp/core/core_module.ts +++ b/tensorboard/webapp/core/core_module.ts @@ -15,7 +15,6 @@ limitations under the License. import {NgModule} from '@angular/core'; import {EffectsModule} from '@ngrx/effects'; import {createSelector, StoreModule} from '@ngrx/store'; - import {DeepLinkerInterface} from '../deeplink'; import { PersistableSettings, diff --git a/tensorboard/webapp/core/effects/core_effects.ts b/tensorboard/webapp/core/effects/core_effects.ts index e7f4f8ca79..a50ceeb7e7 100644 --- a/tensorboard/webapp/core/effects/core_effects.ts +++ b/tensorboard/webapp/core/effects/core_effects.ts @@ -12,8 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import '../../tb_polymer_interop_types'; - import {Injectable} from '@angular/core'; import {Actions, createEffect, ofType} from '@ngrx/effects'; import {Store} from '@ngrx/store'; @@ -31,7 +29,6 @@ import { throttleTime, withLatestFrom, } from 'rxjs/operators'; - import {navigated} from '../../app_routing/actions'; import { getExperimentIdToExperimentAliasMap, @@ -40,6 +37,7 @@ import { } from '../../app_routing/store/app_routing_selectors'; import {RouteKind} from '../../app_routing/types'; import {getEnabledExperimentalPlugins} from '../../feature_flag/store/feature_flag_selectors'; +import '../../tb_polymer_interop_types'; import {DataLoadState} from '../../types/data'; import { TBServerDataSource, diff --git a/tensorboard/webapp/core/effects/core_effects_test.ts b/tensorboard/webapp/core/effects/core_effects_test.ts index 2a775f90e9..6e83fcd6c1 100644 --- a/tensorboard/webapp/core/effects/core_effects_test.ts +++ b/tensorboard/webapp/core/effects/core_effects_test.ts @@ -22,7 +22,6 @@ import {provideMockActions} from '@ngrx/effects/testing'; import {Action, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {of, ReplaySubject, Subject} from 'rxjs'; - import { getExperimentIdToExperimentAliasMap, getRouteId, diff --git a/tensorboard/webapp/core/store/core_initial_state_provider.ts b/tensorboard/webapp/core/store/core_initial_state_provider.ts index 5dfd15c0a7..40aa0bf8ee 100644 --- a/tensorboard/webapp/core/store/core_initial_state_provider.ts +++ b/tensorboard/webapp/core/store/core_initial_state_provider.ts @@ -14,10 +14,8 @@ limitations under the License. ==============================================================================*/ import {InjectionToken} from '@angular/core'; import {StoreConfig} from '@ngrx/store'; - -import {CoreState} from './core_types'; import {DeepLinkerInterface} from '../../deeplink'; -import {initialState} from './core_types'; +import {CoreState, initialState} from './core_types'; export const CORE_STORE_CONFIG_TOKEN = new InjectionToken< StoreConfig diff --git a/tensorboard/webapp/core/store/core_initial_state_provider_test.ts b/tensorboard/webapp/core/store/core_initial_state_provider_test.ts index 1609c71b44..cfe9061a42 100644 --- a/tensorboard/webapp/core/store/core_initial_state_provider_test.ts +++ b/tensorboard/webapp/core/store/core_initial_state_provider_test.ts @@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {getConfig} from './core_initial_state_provider'; import {DeepLinkerInterface, SetStringOption} from '../../deeplink/types'; +import {getConfig} from './core_initial_state_provider'; import {CoreState} from './core_types'; class TestableDeepLinker implements DeepLinkerInterface { diff --git a/tensorboard/webapp/core/store/core_reducers.ts b/tensorboard/webapp/core/store/core_reducers.ts index 00886359d3..9bd3923cc0 100644 --- a/tensorboard/webapp/core/store/core_reducers.ts +++ b/tensorboard/webapp/core/store/core_reducers.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Action, createReducer, on} from '@ngrx/store'; - import {metricsPromoGoToScalars} from '../../metrics/actions'; import {globalSettingsLoaded} from '../../persistent_settings'; import {DataLoadState} from '../../types/data'; diff --git a/tensorboard/webapp/core/store/core_selectors.ts b/tensorboard/webapp/core/store/core_selectors.ts index 74105c3e08..173d37e719 100644 --- a/tensorboard/webapp/core/store/core_selectors.ts +++ b/tensorboard/webapp/core/store/core_selectors.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {createFeatureSelector, createSelector} from '@ngrx/store'; - import {Environment, PluginId, PluginsListing} from '../../types/api'; import {DataLoadState, LoadState} from '../../types/data'; import { diff --git a/tensorboard/webapp/core/store/core_types.ts b/tensorboard/webapp/core/store/core_types.ts index 399d71f0f2..fb3ccc3981 100644 --- a/tensorboard/webapp/core/store/core_types.ts +++ b/tensorboard/webapp/core/store/core_types.ts @@ -20,7 +20,6 @@ limitations under the License. // remove this import, and write the divergent state types explicitly here. import {Environment, PluginId, PluginsListing} from '../../types/api'; import {DataLoadState, LoadState} from '../../types/data'; - import {PluginsListFailureCode, Run, RunId} from '../types'; export const CORE_FEATURE_KEY = 'core'; diff --git a/tensorboard/webapp/core/testing/index.ts b/tensorboard/webapp/core/testing/index.ts index fb5dd60337..e961d098cd 100644 --- a/tensorboard/webapp/core/testing/index.ts +++ b/tensorboard/webapp/core/testing/index.ts @@ -18,7 +18,7 @@ import { PluginMetadata, } from '../../types/api'; import {DataLoadState} from '../../types/data'; -import {CoreState, State, CORE_FEATURE_KEY} from '../store/core_types'; +import {CoreState, CORE_FEATURE_KEY, State} from '../store/core_types'; export function buildPluginMetadata( override: Partial diff --git a/tensorboard/webapp/core/views/dark_mode_supporter_container.ts b/tensorboard/webapp/core/views/dark_mode_supporter_container.ts index fae153f527..2f789b6a15 100644 --- a/tensorboard/webapp/core/views/dark_mode_supporter_container.ts +++ b/tensorboard/webapp/core/views/dark_mode_supporter_container.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {ChangeDetectionStrategy, Component} from '@angular/core'; import {Store} from '@ngrx/store'; - import {State} from '../../app_state'; import {getDarkModeEnabled} from '../../selectors'; diff --git a/tensorboard/webapp/core/views/dark_mode_supporter_module.ts b/tensorboard/webapp/core/views/dark_mode_supporter_module.ts index 8560f270d4..bfd2da58d3 100644 --- a/tensorboard/webapp/core/views/dark_mode_supporter_module.ts +++ b/tensorboard/webapp/core/views/dark_mode_supporter_module.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - import {DarkModeSupportContainer} from './dark_mode_supporter_container'; @NgModule({ diff --git a/tensorboard/webapp/core/views/dark_mode_supporter_test.ts b/tensorboard/webapp/core/views/dark_mode_supporter_test.ts index 0fc41ba441..00f74c8808 100644 --- a/tensorboard/webapp/core/views/dark_mode_supporter_test.ts +++ b/tensorboard/webapp/core/views/dark_mode_supporter_test.ts @@ -16,7 +16,6 @@ import {TestBed} from '@angular/core/testing'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; - import {State} from '../../app_state'; import {getDarkModeEnabled} from '../../selectors'; import {DarkModeSupportContainer} from './dark_mode_supporter_container'; diff --git a/tensorboard/webapp/core/views/hash_storage_component.ts b/tensorboard/webapp/core/views/hash_storage_component.ts index 0b64f19974..6339eae034 100644 --- a/tensorboard/webapp/core/views/hash_storage_component.ts +++ b/tensorboard/webapp/core/views/hash_storage_component.ts @@ -25,7 +25,6 @@ import { } from '@angular/core'; import {fromEvent, Observable, Subject} from 'rxjs'; import {takeUntil} from 'rxjs/operators'; - import {DeepLinkerInterface, SetStringOption} from '../../deeplink/types'; export enum ChangedProp { diff --git a/tensorboard/webapp/core/views/hash_storage_container.ts b/tensorboard/webapp/core/views/hash_storage_container.ts index 289f44401f..a5dab2d527 100644 --- a/tensorboard/webapp/core/views/hash_storage_container.ts +++ b/tensorboard/webapp/core/views/hash_storage_container.ts @@ -13,12 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {ChangeDetectionStrategy, Component} from '@angular/core'; -import {Store, select} from '@ngrx/store'; - -import {getActivePlugin} from '../store'; -import {State} from '../state'; +import {select, Store} from '@ngrx/store'; import {pluginUrlHashChanged} from '../actions'; - +import {State} from '../state'; +import {getActivePlugin} from '../store'; import {ChangedProp} from './hash_storage_component'; @Component({ diff --git a/tensorboard/webapp/core/views/hash_storage_module.ts b/tensorboard/webapp/core/views/hash_storage_module.ts index 802b552df1..db2e2edb7e 100644 --- a/tensorboard/webapp/core/views/hash_storage_module.ts +++ b/tensorboard/webapp/core/views/hash_storage_module.ts @@ -12,12 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; - -import {HashStorageContainer} from './hash_storage_container'; -import {HashStorageComponent} from './hash_storage_component'; +import {NgModule} from '@angular/core'; import {DeepLinkModule} from '../../deeplink/deeplink_module'; +import {HashStorageComponent} from './hash_storage_component'; +import {HashStorageContainer} from './hash_storage_container'; @NgModule({ declarations: [HashStorageContainer, HashStorageComponent], diff --git a/tensorboard/webapp/core/views/hash_storage_test.ts b/tensorboard/webapp/core/views/hash_storage_test.ts index fa46b41e8f..f7ce965506 100644 --- a/tensorboard/webapp/core/views/hash_storage_test.ts +++ b/tensorboard/webapp/core/views/hash_storage_test.ts @@ -12,20 +12,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +import {CommonModule} from '@angular/common'; import {TestBed} from '@angular/core/testing'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; -import {CommonModule} from '@angular/common'; - -import {getActivePlugin} from '../store'; -import {State} from '../state'; -import {pluginUrlHashChanged} from '../actions'; +import {MockStore, provideMockStore} from '@ngrx/store/testing'; +import {DeepLinkerInterface} from '../../deeplink'; import {SetStringOption} from '../../deeplink/types'; - -import {HashStorageContainer} from './hash_storage_container'; +import {pluginUrlHashChanged} from '../actions'; +import {State} from '../state'; +import {getActivePlugin} from '../store'; import {HashStorageComponent} from './hash_storage_component'; -import {DeepLinkerInterface} from '../../deeplink'; +import {HashStorageContainer} from './hash_storage_container'; class TestableDeeplinker implements DeepLinkerInterface { getString(key: string) { diff --git a/tensorboard/webapp/core/views/layout_container.ts b/tensorboard/webapp/core/views/layout_container.ts index b1d64f5189..e714ed9b19 100644 --- a/tensorboard/webapp/core/views/layout_container.ts +++ b/tensorboard/webapp/core/views/layout_container.ts @@ -21,11 +21,10 @@ import { import {Store} from '@ngrx/store'; import {fromEvent, Observable, Subject} from 'rxjs'; import {filter, takeUntil} from 'rxjs/operators'; - +import {MouseEventButtons} from '../../util/dom'; import {sideBarWidthChanged} from '../actions'; import {State} from '../state'; import {getSideBarWidthInPercent} from '../store/core_selectors'; -import {MouseEventButtons} from '../../util/dom'; @Component({ selector: 'tb-dashboard-layout', diff --git a/tensorboard/webapp/core/views/layout_module.ts b/tensorboard/webapp/core/views/layout_module.ts index fa48db1cb5..5a6fc1d7f4 100644 --- a/tensorboard/webapp/core/views/layout_module.ts +++ b/tensorboard/webapp/core/views/layout_module.ts @@ -16,7 +16,6 @@ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {MatButtonModule} from '@angular/material/button'; import {MatIconModule} from '@angular/material/icon'; - import {LayoutContainer} from './layout_container'; /** diff --git a/tensorboard/webapp/core/views/layout_test.ts b/tensorboard/webapp/core/views/layout_test.ts index 2a473020a8..c945031acc 100644 --- a/tensorboard/webapp/core/views/layout_test.ts +++ b/tensorboard/webapp/core/views/layout_test.ts @@ -18,7 +18,6 @@ import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Action, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; - import {MatIconTestingModule} from '../../testing/mat_icon_module'; import {MouseEventButtons} from '../../util/dom'; import {sideBarWidthChanged} from '../actions'; diff --git a/tensorboard/webapp/core/views/page_title_container.ts b/tensorboard/webapp/core/views/page_title_container.ts index 489a31bb66..c9300415b7 100644 --- a/tensorboard/webapp/core/views/page_title_container.ts +++ b/tensorboard/webapp/core/views/page_title_container.ts @@ -22,21 +22,19 @@ import {Store} from '@ngrx/store'; import { combineLatestWith, distinctUntilChanged, - map, filter, + map, mergeMap, startWith, - withLatestFrom, } from 'rxjs/operators'; +import {RouteKind} from '../../app_routing/types'; import { - getRouteKind, - getExperimentIdsFromRoute, getExperiment, + getExperimentIdsFromRoute, + getRouteKind, } from '../../selectors'; -import {RouteKind} from '../../app_routing/types'; - -import {getEnvironment} from '../store'; import {State} from '../state'; +import {getEnvironment} from '../store'; import {TB_BRAND_NAME} from '../types'; const DEFAULT_BRAND_NAME = 'TensorBoard'; diff --git a/tensorboard/webapp/core/views/page_title_module.ts b/tensorboard/webapp/core/views/page_title_module.ts index ca3cd0f9cd..63ebe77062 100644 --- a/tensorboard/webapp/core/views/page_title_module.ts +++ b/tensorboard/webapp/core/views/page_title_module.ts @@ -12,11 +12,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; - -import {PageTitleContainer} from './page_title_container'; +import {NgModule} from '@angular/core'; import {PageTitleComponent} from './page_title_component'; +import {PageTitleContainer} from './page_title_container'; @NgModule({ declarations: [PageTitleContainer, PageTitleComponent], diff --git a/tensorboard/webapp/core/views/page_title_test.ts b/tensorboard/webapp/core/views/page_title_test.ts index 85fdbaa631..0865216f36 100644 --- a/tensorboard/webapp/core/views/page_title_test.ts +++ b/tensorboard/webapp/core/views/page_title_test.ts @@ -15,22 +15,20 @@ limitations under the License. import {Component, NO_ERRORS_SCHEMA} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - -import {State} from '../state'; -import {getEnvironment} from '../store'; +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {RouteKind} from '../../app_routing/types'; import {buildExperiment} from '../../experiments/store/testing'; import { - getRouteKind, - getExperimentIdsFromRoute, getExperiment, + getExperimentIdsFromRoute, + getRouteKind, } from '../../selectors'; +import {State} from '../state'; +import {getEnvironment} from '../store'; import {TB_BRAND_NAME} from '../types'; - -import {PageTitleModule} from './page_title_module'; import {PageTitleComponent, TEST_ONLY} from './page_title_component'; import {PageTitleContainer} from './page_title_container'; +import {PageTitleModule} from './page_title_module'; describe('page title test', () => { let store: MockStore; diff --git a/tensorboard/webapp/customization/customization_module.ts b/tensorboard/webapp/customization/customization_module.ts index 71cd52a970..5aeb34f2bf 100644 --- a/tensorboard/webapp/customization/customization_module.ts +++ b/tensorboard/webapp/customization/customization_module.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {CustomizableComponent} from './customizable_component'; @NgModule({ diff --git a/tensorboard/webapp/customization/customization_test.ts b/tensorboard/webapp/customization/customization_test.ts index 7dd4351c15..c7bb31d512 100644 --- a/tensorboard/webapp/customization/customization_test.ts +++ b/tensorboard/webapp/customization/customization_test.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {Component, NgModule, Optional} from '@angular/core'; import {TestBed} from '@angular/core/testing'; - import {CustomizationModule} from './customization_module'; /** diff --git a/tensorboard/webapp/deeplink/deeplink_module.ts b/tensorboard/webapp/deeplink/deeplink_module.ts index 488704a10e..4f18b8d342 100644 --- a/tensorboard/webapp/deeplink/deeplink_module.ts +++ b/tensorboard/webapp/deeplink/deeplink_module.ts @@ -13,9 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - -import {DeepLinkerInterface} from './types'; import {HashDeepLinker} from './hash'; +import {DeepLinkerInterface} from './types'; @NgModule({ providers: [{provide: DeepLinkerInterface, useClass: HashDeepLinker}], diff --git a/tensorboard/webapp/deeplink/deeplink_test.ts b/tensorboard/webapp/deeplink/deeplink_test.ts index 047ac89c32..05783321db 100644 --- a/tensorboard/webapp/deeplink/deeplink_test.ts +++ b/tensorboard/webapp/deeplink/deeplink_test.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {TestBed} from '@angular/core/testing'; - import {HashDeepLinker, TEST_ONLY} from './hash'; describe('deeplink', () => { diff --git a/tensorboard/webapp/deeplink/hash.ts b/tensorboard/webapp/deeplink/hash.ts index 666320405d..3c25e885af 100644 --- a/tensorboard/webapp/deeplink/hash.ts +++ b/tensorboard/webapp/deeplink/hash.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {Injectable} from '@angular/core'; - import {TfStorageElement} from '../tb_polymer_interop_types'; import {DeepLinkerInterface, SetStringOption} from './types'; diff --git a/tensorboard/webapp/deeplink/hash_test.ts b/tensorboard/webapp/deeplink/hash_test.ts index 0003943426..a440f65cef 100644 --- a/tensorboard/webapp/deeplink/hash_test.ts +++ b/tensorboard/webapp/deeplink/hash_test.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {TestBed} from '@angular/core/testing'; - import {HashStorageComponent} from './hash'; describe('hash storage test', () => { diff --git a/tensorboard/webapp/deeplink/index.ts b/tensorboard/webapp/deeplink/index.ts index 3ff40032e9..c12c9ddc4d 100644 --- a/tensorboard/webapp/deeplink/index.ts +++ b/tensorboard/webapp/deeplink/index.ts @@ -13,5 +13,5 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -export * from './types'; export * from './hash'; +export * from './types'; diff --git a/tensorboard/webapp/experiments/experiments_module.ts b/tensorboard/webapp/experiments/experiments_module.ts index 5a5b8a71be..01c25b5a71 100644 --- a/tensorboard/webapp/experiments/experiments_module.ts +++ b/tensorboard/webapp/experiments/experiments_module.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; import {StoreModule} from '@ngrx/store'; - import {reducers} from './store'; import {EXPERIMENTS_FEATURE_KEY} from './store/experiments_types'; diff --git a/tensorboard/webapp/experiments/store/experiments_reducers.ts b/tensorboard/webapp/experiments/store/experiments_reducers.ts index 118a3b501f..b133cd4858 100644 --- a/tensorboard/webapp/experiments/store/experiments_reducers.ts +++ b/tensorboard/webapp/experiments/store/experiments_reducers.ts @@ -18,9 +18,7 @@ import { combineReducers, createReducer, } from '@ngrx/store'; - import {DEFAULT_EXPERIMENT_ID} from '../../app_routing/types'; - import {ExperimentsDataState, ExperimentsState} from './experiments_types'; const defaultExperiment = { diff --git a/tensorboard/webapp/experiments/store/experiments_selectors.ts b/tensorboard/webapp/experiments/store/experiments_selectors.ts index 807f052277..cd8cc3adc0 100644 --- a/tensorboard/webapp/experiments/store/experiments_selectors.ts +++ b/tensorboard/webapp/experiments/store/experiments_selectors.ts @@ -13,13 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {createFeatureSelector, createSelector} from '@ngrx/store'; - import {Experiment} from '../types'; - import { - EXPERIMENTS_FEATURE_KEY, ExperimentsDataState, ExperimentsState, + EXPERIMENTS_FEATURE_KEY, State, } from './experiments_types'; diff --git a/tensorboard/webapp/experiments/store/testing.ts b/tensorboard/webapp/experiments/store/testing.ts index 37138b882e..0916337cb9 100644 --- a/tensorboard/webapp/experiments/store/testing.ts +++ b/tensorboard/webapp/experiments/store/testing.ts @@ -14,10 +14,10 @@ limitations under the License. ==============================================================================*/ import {Experiment} from '../types'; import { - EXPERIMENTS_FEATURE_KEY, + ExperimentsDataState, ExperimentsState, + EXPERIMENTS_FEATURE_KEY, State, - ExperimentsDataState, } from './experiments_types'; /** diff --git a/tensorboard/webapp/feature_flag/actions/feature_flag_actions.ts b/tensorboard/webapp/feature_flag/actions/feature_flag_actions.ts index 87a1db8613..a9588237f0 100644 --- a/tensorboard/webapp/feature_flag/actions/feature_flag_actions.ts +++ b/tensorboard/webapp/feature_flag/actions/feature_flag_actions.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {createAction, props} from '@ngrx/store'; - import {FeatureFlags} from '../types'; /** diff --git a/tensorboard/webapp/feature_flag/effects/feature_flag_effects.ts b/tensorboard/webapp/feature_flag/effects/feature_flag_effects.ts index 7b066c3813..226c629158 100644 --- a/tensorboard/webapp/feature_flag/effects/feature_flag_effects.ts +++ b/tensorboard/webapp/feature_flag/effects/feature_flag_effects.ts @@ -14,10 +14,9 @@ limitations under the License. ==============================================================================*/ import {Injectable} from '@angular/core'; -import {createAction, Action, Store} from '@ngrx/store'; -import {Actions, ofType, createEffect} from '@ngrx/effects'; -import {map, combineLatestWith} from 'rxjs/operators'; - +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {Action, createAction, Store} from '@ngrx/store'; +import {combineLatestWith, map} from 'rxjs/operators'; import {TBFeatureFlagDataSource} from '../../webapp_data_source/tb_feature_flag_data_source_types'; import {partialFeatureFlagsLoaded} from '../actions/feature_flag_actions'; import {getIsAutoDarkModeAllowed} from '../store/feature_flag_selectors'; diff --git a/tensorboard/webapp/feature_flag/effects/feature_flag_effects_test.ts b/tensorboard/webapp/feature_flag/effects/feature_flag_effects_test.ts index ac2d0b7e45..54fa78b566 100644 --- a/tensorboard/webapp/feature_flag/effects/feature_flag_effects_test.ts +++ b/tensorboard/webapp/feature_flag/effects/feature_flag_effects_test.ts @@ -18,7 +18,6 @@ import {provideMockActions} from '@ngrx/effects/testing'; import {Action, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {ReplaySubject} from 'rxjs'; - import { TBFeatureFlagTestingModule, TestingTBFeatureFlagDataSource, diff --git a/tensorboard/webapp/feature_flag/feature_flag_module.ts b/tensorboard/webapp/feature_flag/feature_flag_module.ts index e94ff00955..1bee177bb1 100644 --- a/tensorboard/webapp/feature_flag/feature_flag_module.ts +++ b/tensorboard/webapp/feature_flag/feature_flag_module.ts @@ -16,7 +16,6 @@ limitations under the License. import {NgModule} from '@angular/core'; import {EffectsModule} from '@ngrx/effects'; import {createSelector, StoreModule} from '@ngrx/store'; - import { PersistableSettings, PersistentSettingsConfigModule, diff --git a/tensorboard/webapp/feature_flag/store/feature_flag_reducers.ts b/tensorboard/webapp/feature_flag/store/feature_flag_reducers.ts index c6200638f0..7426381eee 100644 --- a/tensorboard/webapp/feature_flag/store/feature_flag_reducers.ts +++ b/tensorboard/webapp/feature_flag/store/feature_flag_reducers.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Action, createReducer, on} from '@ngrx/store'; - import {globalSettingsLoaded, ThemeValue} from '../../persistent_settings'; import * as actions from '../actions/feature_flag_actions'; import {initialState} from './feature_flag_store_config_provider'; diff --git a/tensorboard/webapp/feature_flag/store/feature_flag_selectors.ts b/tensorboard/webapp/feature_flag/store/feature_flag_selectors.ts index 7941c00dca..9b2ec299a0 100644 --- a/tensorboard/webapp/feature_flag/store/feature_flag_selectors.ts +++ b/tensorboard/webapp/feature_flag/store/feature_flag_selectors.ts @@ -13,8 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {createSelector, createFeatureSelector} from '@ngrx/store'; - +import {createFeatureSelector, createSelector} from '@ngrx/store'; import {FeatureFlags} from '../types'; import { FeatureFlagState, diff --git a/tensorboard/webapp/feature_flag/store/feature_flag_store_config_provider.ts b/tensorboard/webapp/feature_flag/store/feature_flag_store_config_provider.ts index 952820e1ce..28b3aaf52c 100644 --- a/tensorboard/webapp/feature_flag/store/feature_flag_store_config_provider.ts +++ b/tensorboard/webapp/feature_flag/store/feature_flag_store_config_provider.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {InjectionToken} from '@angular/core'; import {StoreConfig} from '@ngrx/store'; - import {FeatureFlagState} from './feature_flag_types'; export const initialState: FeatureFlagState = { diff --git a/tensorboard/webapp/feature_flag/store/testing.ts b/tensorboard/webapp/feature_flag/store/testing.ts index f12b0ff0a1..a5262d8f8e 100644 --- a/tensorboard/webapp/feature_flag/store/testing.ts +++ b/tensorboard/webapp/feature_flag/store/testing.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {FeatureFlagState, FEATURE_FLAG_FEATURE_KEY} from './feature_flag_types'; import {buildFeatureFlag} from '../testing'; +import {FeatureFlagState, FEATURE_FLAG_FEATURE_KEY} from './feature_flag_types'; export {buildFeatureFlag} from '../testing'; diff --git a/tensorboard/webapp/header/dark_mode_toggle_container.ts b/tensorboard/webapp/header/dark_mode_toggle_container.ts index dc2dd36f0a..2107886c4e 100644 --- a/tensorboard/webapp/header/dark_mode_toggle_container.ts +++ b/tensorboard/webapp/header/dark_mode_toggle_container.ts @@ -16,11 +16,10 @@ import {Component} from '@angular/core'; import {Store} from '@ngrx/store'; import {Observable} from 'rxjs'; import {map} from 'rxjs/operators'; - import {State as CoreState} from '../core/store/core_types'; -import {State as FeatureFlagState} from '../feature_flag/store/feature_flag_types'; import {overrideEnableDarkModeChanged} from '../feature_flag/actions/feature_flag_actions'; import {getEnableDarkModeOverride} from '../feature_flag/store/feature_flag_selectors'; +import {State as FeatureFlagState} from '../feature_flag/store/feature_flag_types'; import {DarkModeOverride} from './dark_mode_toggle_component'; @Component({ diff --git a/tensorboard/webapp/header/dark_mode_toggle_test.ts b/tensorboard/webapp/header/dark_mode_toggle_test.ts index a32efba0d2..3f08db4233 100644 --- a/tensorboard/webapp/header/dark_mode_toggle_test.ts +++ b/tensorboard/webapp/header/dark_mode_toggle_test.ts @@ -21,7 +21,6 @@ import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Action, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; - import {State} from '../core/store'; import {overrideEnableDarkModeChanged} from '../feature_flag/actions/feature_flag_actions'; import {getEnableDarkModeOverride} from '../selectors'; diff --git a/tensorboard/webapp/header/header_module.ts b/tensorboard/webapp/header/header_module.ts index 7d34bce8fd..d51c7db81b 100644 --- a/tensorboard/webapp/header/header_module.ts +++ b/tensorboard/webapp/header/header_module.ts @@ -12,21 +12,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {NgModule} from '@angular/core'; // Uses `async` pipe. import {CommonModule} from '@angular/common'; - +import {NgModule} from '@angular/core'; import {MatButtonModule} from '@angular/material/button'; import {MatIconModule} from '@angular/material/icon'; +import {MatMenuModule} from '@angular/material/menu'; import {MatSelectModule} from '@angular/material/select'; import {MatTabsModule} from '@angular/material/tabs'; -import {MatMenuModule} from '@angular/material/menu'; import {MatToolbarModule} from '@angular/material/toolbar'; - import {CoreModule} from '../core/core_module'; import {SettingsModule} from '../settings/settings_module'; import {TbdevUploadModule} from '../tbdev_upload/tbdev_upload_module'; - import {DarkModeToggleComponent} from './dark_mode_toggle_component'; import {DarkModeToggleContainer} from './dark_mode_toggle_container'; import {HeaderComponent} from './header_component'; diff --git a/tensorboard/webapp/header/header_test.ts b/tensorboard/webapp/header/header_test.ts index 9b31d1dbde..578f9b8c7c 100644 --- a/tensorboard/webapp/header/header_test.ts +++ b/tensorboard/webapp/header/header_test.ts @@ -22,7 +22,6 @@ import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; - import {changePlugin, manualReload} from '../core/actions'; import {State} from '../core/store'; import { diff --git a/tensorboard/webapp/header/plugin_selector_component.ts b/tensorboard/webapp/header/plugin_selector_component.ts index e244e38a4f..c486424bac 100644 --- a/tensorboard/webapp/header/plugin_selector_component.ts +++ b/tensorboard/webapp/header/plugin_selector_component.ts @@ -12,9 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {Component, Input, Output, EventEmitter} from '@angular/core'; +import {Component, EventEmitter, Input, Output} from '@angular/core'; import {MatSelectChange} from '@angular/material/select'; - import {PluginId} from '../types/api'; import {UiPluginMetadata} from './types'; diff --git a/tensorboard/webapp/header/plugin_selector_container.ts b/tensorboard/webapp/header/plugin_selector_container.ts index dfce7cea64..d44c131864 100644 --- a/tensorboard/webapp/header/plugin_selector_container.ts +++ b/tensorboard/webapp/header/plugin_selector_container.ts @@ -13,11 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Component} from '@angular/core'; -import {Store, select, createSelector} from '@ngrx/store'; - -import {getActivePlugin, getPlugins, State} from '../core/store'; +import {createSelector, select, Store} from '@ngrx/store'; import {changePlugin} from '../core/actions'; - +import {getActivePlugin, getPlugins, State} from '../core/store'; import {PluginId} from '../types/api'; import {UiPluginMetadata} from './types'; diff --git a/tensorboard/webapp/header/reload_container.ts b/tensorboard/webapp/header/reload_container.ts index 80a0b3a894..9f94d0b07d 100644 --- a/tensorboard/webapp/header/reload_container.ts +++ b/tensorboard/webapp/header/reload_container.ts @@ -16,7 +16,6 @@ import {Component} from '@angular/core'; import {createSelector, Store} from '@ngrx/store'; import {Observable} from 'rxjs'; import {combineLatestWith, map} from 'rxjs/operators'; - import {manualReload} from '../core/actions'; import { getActivePlugin, diff --git a/tensorboard/webapp/header/types.ts b/tensorboard/webapp/header/types.ts index ffd271fd93..6dda993f4d 100644 --- a/tensorboard/webapp/header/types.ts +++ b/tensorboard/webapp/header/types.ts @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {PluginMetadata, PluginId} from '../types/api'; +import {PluginId, PluginMetadata} from '../types/api'; export interface UiPluginMetadata extends PluginMetadata { id: PluginId; diff --git a/tensorboard/webapp/hparams/_redux/hparams_actions.ts b/tensorboard/webapp/hparams/_redux/hparams_actions.ts index cdeea78f57..336490c32d 100644 --- a/tensorboard/webapp/hparams/_redux/hparams_actions.ts +++ b/tensorboard/webapp/hparams/_redux/hparams_actions.ts @@ -17,7 +17,6 @@ limitations under the License. */ import {createAction, props} from '@ngrx/store'; - import {DiscreteHparamValues} from '../types'; export const hparamsDiscreteHparamFilterChanged = createAction( diff --git a/tensorboard/webapp/hparams/_redux/hparams_module.ts b/tensorboard/webapp/hparams/_redux/hparams_module.ts index 86aabbbbf7..f57752c424 100644 --- a/tensorboard/webapp/hparams/_redux/hparams_module.ts +++ b/tensorboard/webapp/hparams/_redux/hparams_module.ts @@ -14,9 +14,8 @@ limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; import {StoreModule} from '@ngrx/store'; - -import {HPARAMS_FEATURE_KEY} from './types'; import {reducers} from './hparams_reducers'; +import {HPARAMS_FEATURE_KEY} from './types'; @NgModule({ imports: [StoreModule.forFeature(HPARAMS_FEATURE_KEY, reducers)], diff --git a/tensorboard/webapp/hparams/_redux/hparams_reducers.ts b/tensorboard/webapp/hparams/_redux/hparams_reducers.ts index dfe82dc16e..9690771639 100644 --- a/tensorboard/webapp/hparams/_redux/hparams_reducers.ts +++ b/tensorboard/webapp/hparams/_redux/hparams_reducers.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Action, ActionReducer, createReducer, on} from '@ngrx/store'; - import {fetchRunsSucceeded} from '../../runs/actions'; import { DiscreteFilter, diff --git a/tensorboard/webapp/hparams/_redux/hparams_reducers_test.ts b/tensorboard/webapp/hparams/_redux/hparams_reducers_test.ts index 6d5742bbbc..db807810af 100644 --- a/tensorboard/webapp/hparams/_redux/hparams_reducers_test.ts +++ b/tensorboard/webapp/hparams/_redux/hparams_reducers_test.ts @@ -21,12 +21,12 @@ import * as actions from './hparams_actions'; import {reducers} from './hparams_reducers'; import { buildDiscreteFilter, + buildFilterState, buildHparamSpec, buildHparamsState, buildIntervalFilter, buildMetricSpec, buildSpecs, - buildFilterState, } from './testing'; describe('hparams/_redux/hparams_reducers_test', () => { diff --git a/tensorboard/webapp/hparams/_redux/hparams_selectors.ts b/tensorboard/webapp/hparams/_redux/hparams_selectors.ts index 924a636497..adcfd935ae 100644 --- a/tensorboard/webapp/hparams/_redux/hparams_selectors.ts +++ b/tensorboard/webapp/hparams/_redux/hparams_selectors.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {createFeatureSelector, createSelector} from '@ngrx/store'; - import {DiscreteFilter, HparamAndMetricSpec, IntervalFilter} from '../types'; import {combineHparamAndMetricSpecs} from './hparams_selectors_utils'; import {HparamsState, HPARAMS_FEATURE_KEY, State} from './types'; diff --git a/tensorboard/webapp/hparams/_redux/hparams_selectors_utils.ts b/tensorboard/webapp/hparams/_redux/hparams_selectors_utils.ts index 36d02418d6..53b43bbe18 100644 --- a/tensorboard/webapp/hparams/_redux/hparams_selectors_utils.ts +++ b/tensorboard/webapp/hparams/_redux/hparams_selectors_utils.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import { - HparamAndMetricSpec, DomainType, + HparamAndMetricSpec, HparamSpec, MetricSpec, } from '../types'; diff --git a/tensorboard/webapp/hparams/_redux/utils.ts b/tensorboard/webapp/hparams/_redux/utils.ts index 13c772934d..06b5b59f98 100644 --- a/tensorboard/webapp/hparams/_redux/utils.ts +++ b/tensorboard/webapp/hparams/_redux/utils.ts @@ -15,10 +15,10 @@ limitations under the License. import { DiscreteFilter, + DiscreteHparamValue, DiscreteHparamValues, DomainType, IntervalFilter, - DiscreteHparamValue, } from '../types'; export function getIdFromExperimentIds(experimentIds: string[]): string { diff --git a/tensorboard/webapp/hparams/hparams_module.ts b/tensorboard/webapp/hparams/hparams_module.ts index d938339996..2079b0c0a2 100644 --- a/tensorboard/webapp/hparams/hparams_module.ts +++ b/tensorboard/webapp/hparams/hparams_module.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - import {HparamsModule as ReduxModule} from './_redux/hparams_module'; @NgModule({ diff --git a/tensorboard/webapp/hparams/types.ts b/tensorboard/webapp/hparams/types.ts index 3378ffdd93..b5db857f1f 100644 --- a/tensorboard/webapp/hparams/types.ts +++ b/tensorboard/webapp/hparams/types.ts @@ -13,6 +13,5 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -export * from './_types'; - export {State} from './_redux/types'; +export * from './_types'; diff --git a/tensorboard/webapp/main_prod.ts b/tensorboard/webapp/main_prod.ts index 638fc60979..d8ee700fc1 100644 --- a/tensorboard/webapp/main_prod.ts +++ b/tensorboard/webapp/main_prod.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {enableProdMode} from '@angular/core'; - import './bootstrap'; enableProdMode(); diff --git a/tensorboard/webapp/mat_icon_module.ts b/tensorboard/webapp/mat_icon_module.ts index 69aec6c42a..e769f8211a 100644 --- a/tensorboard/webapp/mat_icon_module.ts +++ b/tensorboard/webapp/mat_icon_module.ts @@ -9,12 +9,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {DomSanitizer} from '@angular/platform-browser'; import {NgModule} from '@angular/core'; import { MatIconModule as NgMatIconModule, MatIconRegistry, } from '@angular/material/icon'; +import {DomSanitizer} from '@angular/platform-browser'; const SVG_PATH = './icon_bundle.svg'; diff --git a/tensorboard/webapp/metrics/actions/index.ts b/tensorboard/webapp/metrics/actions/index.ts index d2e5302892..62a06d7d1c 100644 --- a/tensorboard/webapp/metrics/actions/index.ts +++ b/tensorboard/webapp/metrics/actions/index.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {createAction, props} from '@ngrx/store'; - import {ElementId} from '../../util/dom'; import { TagMetadata, diff --git a/tensorboard/webapp/metrics/data_source/metrics_data_source.ts b/tensorboard/webapp/metrics/data_source/metrics_data_source.ts index 5270e1d7f1..8c0c43867b 100644 --- a/tensorboard/webapp/metrics/data_source/metrics_data_source.ts +++ b/tensorboard/webapp/metrics/data_source/metrics_data_source.ts @@ -16,7 +16,6 @@ import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; import {forkJoin, Observable} from 'rxjs'; import {filter, map, take, withLatestFrom} from 'rxjs/operators'; - import { getIsFeatureFlagsLoaded, getIsMetricsImageSupportEnabled, diff --git a/tensorboard/webapp/metrics/data_source/metrics_data_source_module.ts b/tensorboard/webapp/metrics/data_source/metrics_data_source_module.ts index 152f4c69a6..fa30cd914d 100644 --- a/tensorboard/webapp/metrics/data_source/metrics_data_source_module.ts +++ b/tensorboard/webapp/metrics/data_source/metrics_data_source_module.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - import {FeatureFlagModule} from '../../feature_flag/feature_flag_module'; import {TBHttpClientModule} from '../../webapp_data_source/tb_http_client_module'; import {TBMetricsDataSource} from './metrics_data_source'; diff --git a/tensorboard/webapp/metrics/data_source/metrics_data_source_test.ts b/tensorboard/webapp/metrics/data_source/metrics_data_source_test.ts index 285ef89197..858f1342aa 100644 --- a/tensorboard/webapp/metrics/data_source/metrics_data_source_test.ts +++ b/tensorboard/webapp/metrics/data_source/metrics_data_source_test.ts @@ -15,7 +15,6 @@ limitations under the License. import {TestBed} from '@angular/core/testing'; import {Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; - import {State} from '../../app_state'; import {buildFeatureFlag} from '../../feature_flag/testing'; import * as selectors from '../../selectors'; diff --git a/tensorboard/webapp/metrics/data_source/types.ts b/tensorboard/webapp/metrics/data_source/types.ts index 1263367aad..b85b6f89ea 100644 --- a/tensorboard/webapp/metrics/data_source/types.ts +++ b/tensorboard/webapp/metrics/data_source/types.ts @@ -13,8 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Observable} from 'rxjs'; - -import {PluginType, TooltipSort} from '../internal_types'; +import {PluginType} from '../internal_types'; export {PluginType} from '../internal_types'; diff --git a/tensorboard/webapp/metrics/effects/index.ts b/tensorboard/webapp/metrics/effects/index.ts index 32a050443f..ac8e7540dd 100644 --- a/tensorboard/webapp/metrics/effects/index.ts +++ b/tensorboard/webapp/metrics/effects/index.ts @@ -26,7 +26,6 @@ import { tap, withLatestFrom, } from 'rxjs/operators'; - import * as routingActions from '../../app_routing/actions'; import {State} from '../../app_state'; import * as coreActions from '../../core/actions'; diff --git a/tensorboard/webapp/metrics/effects/metrics_effects_test.ts b/tensorboard/webapp/metrics/effects/metrics_effects_test.ts index 31a41a28ef..1a1890da76 100644 --- a/tensorboard/webapp/metrics/effects/metrics_effects_test.ts +++ b/tensorboard/webapp/metrics/effects/metrics_effects_test.ts @@ -16,21 +16,22 @@ import {TestBed} from '@angular/core/testing'; import {provideMockActions} from '@ngrx/effects/testing'; import {Action, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; -import * as coreActions from '../../core/actions'; -import {getActivePlugin} from '../../core/store'; -import * as coreTesting from '../../core/testing'; -import {DataLoadState} from '../../types/data'; -import {TBHttpClientTestingModule} from '../../webapp_data_source/tb_http_client_testing'; import {of, Subject} from 'rxjs'; - import {buildNavigatedAction, buildRoute} from '../../app_routing/testing'; +import {RouteKind} from '../../app_routing/types'; import {State} from '../../app_state'; +import * as coreActions from '../../core/actions'; +import {getActivePlugin} from '../../core/store'; +import * as coreTesting from '../../core/testing'; import * as selectors from '../../selectors'; +import {LoadingMechanismType} from '../../types/api'; +import {DataLoadState} from '../../types/data'; import {nextElementId} from '../../util/dom'; +import {TBHttpClientTestingModule} from '../../webapp_data_source/tb_http_client_testing'; import * as actions from '../actions'; import { - METRICS_PLUGIN_ID, MetricsDataSource, + METRICS_PLUGIN_ID, MultiRunPluginType, PluginType, SingleRunPluginType, @@ -47,8 +48,6 @@ import { } from '../testing'; import {CardId, TooltipSort} from '../types'; import {CardFetchInfo, MetricsEffects, TEST_ONLY} from './index'; -import {RouteKind} from '../../app_routing/types'; -import {LoadingMechanismType} from '../../types/api'; describe('metrics effects', () => { let dataSource: MetricsDataSource; diff --git a/tensorboard/webapp/metrics/metrics_integration_test.ts b/tensorboard/webapp/metrics/metrics_integration_test.ts index 69a1a2ef3f..8544acaf3b 100644 --- a/tensorboard/webapp/metrics/metrics_integration_test.ts +++ b/tensorboard/webapp/metrics/metrics_integration_test.ts @@ -15,7 +15,6 @@ limitations under the License. import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; - import {IntegrationTestSetupModule} from '../testing/integration_test_module'; import {MetricsModule} from './metrics_module'; import {METRICS_INITIAL_SETTINGS} from './store/metrics_initial_state_provider'; diff --git a/tensorboard/webapp/metrics/metrics_module.ts b/tensorboard/webapp/metrics/metrics_module.ts index 844a1c4e46..e4d063a892 100644 --- a/tensorboard/webapp/metrics/metrics_module.ts +++ b/tensorboard/webapp/metrics/metrics_module.ts @@ -16,7 +16,6 @@ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {EffectsModule} from '@ngrx/effects'; import {Action, createSelector, StoreModule} from '@ngrx/store'; - import {AlertActionModule} from '../alert/alert_action_module'; import {AppRoutingModule} from '../app_routing/app_routing_module'; import {CoreModule} from '../core/core_module'; diff --git a/tensorboard/webapp/metrics/store/index.ts b/tensorboard/webapp/metrics/store/index.ts index a01b8d8263..720f772503 100644 --- a/tensorboard/webapp/metrics/store/index.ts +++ b/tensorboard/webapp/metrics/store/index.ts @@ -12,6 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -export * from './metrics_types'; export * from './metrics_reducers'; export * from './metrics_selectors'; +export * from './metrics_types'; diff --git a/tensorboard/webapp/metrics/store/metrics_initial_state_provider.ts b/tensorboard/webapp/metrics/store/metrics_initial_state_provider.ts index 5868e83475..38cf561490 100644 --- a/tensorboard/webapp/metrics/store/metrics_initial_state_provider.ts +++ b/tensorboard/webapp/metrics/store/metrics_initial_state_provider.ts @@ -15,7 +15,6 @@ limitations under the License. import {InjectionToken} from '@angular/core'; import {StoreConfig} from '@ngrx/store'; - import {INITIAL_STATE} from './metrics_reducers'; import {MetricsSettings, MetricsState} from './metrics_types'; diff --git a/tensorboard/webapp/metrics/store/metrics_reducers.ts b/tensorboard/webapp/metrics/store/metrics_reducers.ts index 289d2821f2..39f097630e 100644 --- a/tensorboard/webapp/metrics/store/metrics_reducers.ts +++ b/tensorboard/webapp/metrics/store/metrics_reducers.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Action, createReducer, on} from '@ngrx/store'; - import {stateRehydratedFromUrl} from '../../app_routing/actions'; import {createRouteContextedState} from '../../app_routing/route_contexted_reducer_helper'; import {RouteKind} from '../../app_routing/types'; @@ -44,6 +43,7 @@ import { TooltipSort, URLDeserializedState, } from '../internal_types'; +import {groupCardIdWithMetdata} from '../utils'; import { buildOrReturnStateWithPinnedCopy, buildOrReturnStateWithUnresolvedImportedPins, @@ -59,15 +59,14 @@ import { CardStepIndexMap, MetricsRoutefulState, MetricsRoutelessState, + MetricsSettings, MetricsState, + METRICS_SETTINGS_DEFAULT, NonSampledPluginTagMetadata, TagMetadata, TimeSeriesData, TimeSeriesLoadable, - METRICS_SETTINGS_DEFAULT, - MetricsSettings, } from './metrics_types'; -import {groupCardIdWithMetdata} from '../utils'; function buildCardMetadataList(tagMetadata: TagMetadata): CardMetadata[] { const results: CardMetadata[] = []; diff --git a/tensorboard/webapp/metrics/store/metrics_selectors.ts b/tensorboard/webapp/metrics/store/metrics_selectors.ts index c3f10612fc..27a1e73cf4 100644 --- a/tensorboard/webapp/metrics/store/metrics_selectors.ts +++ b/tensorboard/webapp/metrics/store/metrics_selectors.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {createFeatureSelector, createSelector} from '@ngrx/store'; - import {State} from '../../app_state'; import {DataLoadState, LoadState} from '../../types/data'; import {ElementId} from '../../util/dom'; diff --git a/tensorboard/webapp/metrics/store/metrics_store_internal_utils.ts b/tensorboard/webapp/metrics/store/metrics_store_internal_utils.ts index e0d7a975b7..a69b941586 100644 --- a/tensorboard/webapp/metrics/store/metrics_store_internal_utils.ts +++ b/tensorboard/webapp/metrics/store/metrics_store_internal_utils.ts @@ -17,7 +17,6 @@ limitations under the License. */ import {DataLoadState} from '../../types/data'; - import {isSampledPlugin, PluginType, SampledPluginType} from '../data_source'; import { CardId, @@ -25,7 +24,6 @@ import { CardUniqueInfo, NonPinnedCardId, } from '../internal_types'; - import { CardMetadataMap, CardStepIndexMap, diff --git a/tensorboard/webapp/metrics/store/metrics_store_internal_utils_test.ts b/tensorboard/webapp/metrics/store/metrics_store_internal_utils_test.ts index 112cd1ae45..3b3438c9d2 100644 --- a/tensorboard/webapp/metrics/store/metrics_store_internal_utils_test.ts +++ b/tensorboard/webapp/metrics/store/metrics_store_internal_utils_test.ts @@ -13,24 +13,22 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {DataLoadState} from '../../types/data'; - import {PluginType} from '../data_source'; import { + buildMetricsState, buildTagMetadata, createCardMetadata, - buildMetricsState, } from '../testing'; - import { buildOrReturnStateWithPinnedCopy, buildOrReturnStateWithUnresolvedImportedPins, + canCreateNewPins, createPluginDataWithLoadable, createRunToLoadState, getCardId, getPinnedCardId, getRunIds, getTimeSeriesLoadable, - canCreateNewPins, TEST_ONLY, } from './metrics_store_internal_utils'; import {ImageTimeSeriesData} from './metrics_types'; diff --git a/tensorboard/webapp/metrics/store/metrics_types.ts b/tensorboard/webapp/metrics/store/metrics_types.ts index 83e66b1f52..ec8ab23357 100644 --- a/tensorboard/webapp/metrics/store/metrics_types.ts +++ b/tensorboard/webapp/metrics/store/metrics_types.ts @@ -12,9 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {DataLoadState, LoadState} from '../../types/data'; - import {RouteContextedState} from '../../app_routing/route_contexted_reducer_helper'; +import {DataLoadState, LoadState} from '../../types/data'; import {ElementId} from '../../util/dom'; import { HistogramStepDatum, @@ -28,14 +27,13 @@ import { } from '../data_source'; import { CardId, - CardUniqueInfo, CardMetadata, + CardUniqueInfo, HistogramMode, NonPinnedCardId, PinnedCardId, TooltipSort, XAxisType, - LinkedTime, } from '../internal_types'; export const METRICS_FEATURE_KEY = 'metrics'; diff --git a/tensorboard/webapp/metrics/testing.ts b/tensorboard/webapp/metrics/testing.ts index c28af385ab..22c0e68ff1 100644 --- a/tensorboard/webapp/metrics/testing.ts +++ b/tensorboard/webapp/metrics/testing.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {Injectable} from '@angular/core'; import {Observable, of} from 'rxjs'; - import {State} from '../app_state'; import {DataLoadState} from '../types/data'; import {HistogramMode} from '../widgets/histogram/histogram_types'; diff --git a/tensorboard/webapp/metrics/utils_test.ts b/tensorboard/webapp/metrics/utils_test.ts index 4a1e66d009..03134f13e1 100644 --- a/tensorboard/webapp/metrics/utils_test.ts +++ b/tensorboard/webapp/metrics/utils_test.ts @@ -13,9 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {PluginType} from './data_source'; - -import {CardIdWithMetadata} from './views/metrics_view_types'; import {compareTagNames, groupCardIdWithMetdata} from './utils'; +import {CardIdWithMetadata} from './views/metrics_view_types'; function buildCardIdWithMetadata( override: Partial diff --git a/tensorboard/webapp/metrics/views/card_renderer/card_lazy_loader.ts b/tensorboard/webapp/metrics/views/card_renderer/card_lazy_loader.ts index 2132173827..153d560084 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/card_lazy_loader.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/card_lazy_loader.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {Directive, ElementRef, Input, OnDestroy, OnInit} from '@angular/core'; import {Store} from '@ngrx/store'; - import {State} from '../../../app_state'; import {ElementId, nextElementId} from '../../../util/dom'; import * as actions from '../../actions'; diff --git a/tensorboard/webapp/metrics/views/card_renderer/card_lazy_loader_test.ts b/tensorboard/webapp/metrics/views/card_renderer/card_lazy_loader_test.ts index 2e216c7105..d6fb866420 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/card_lazy_loader_test.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/card_lazy_loader_test.ts @@ -19,7 +19,6 @@ import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Action, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../app_state'; - import * as actions from '../../actions'; import {appStateFromMetricsState, buildMetricsState} from '../../testing'; import {CardId} from '../../types'; diff --git a/tensorboard/webapp/metrics/views/card_renderer/card_renderer_module.ts b/tensorboard/webapp/metrics/views/card_renderer/card_renderer_module.ts index f6d199582b..411db76542 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/card_renderer_module.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/card_renderer_module.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {IntersectionObserverModule} from '../../../widgets/intersection_observer/intersection_observer_module'; import {CardLazyLoader} from './card_lazy_loader'; import {CardViewComponent} from './card_view_component'; diff --git a/tensorboard/webapp/metrics/views/card_renderer/card_view_component.ts b/tensorboard/webapp/metrics/views/card_renderer/card_view_component.ts index e3c84b65cd..d929266c63 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/card_view_component.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/card_view_component.ts @@ -19,7 +19,6 @@ import { Input, Output, } from '@angular/core'; - import {RunColorScale} from '../../../types/ui'; import {PluginType} from '../../data_source'; import {CardId} from '../../types'; diff --git a/tensorboard/webapp/metrics/views/card_renderer/card_view_container.ts b/tensorboard/webapp/metrics/views/card_renderer/card_view_container.ts index 45a5b5af78..9023667b25 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/card_view_container.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/card_view_container.ts @@ -21,7 +21,6 @@ import { import {Store} from '@ngrx/store'; import {Observable} from 'rxjs'; import {map, take, throttleTime, withLatestFrom} from 'rxjs/operators'; - import {State} from '../../../app_state'; import * as selectors from '../../../selectors'; import {RunColorScale} from '../../../types/ui'; diff --git a/tensorboard/webapp/metrics/views/card_renderer/card_view_test.ts b/tensorboard/webapp/metrics/views/card_renderer/card_view_test.ts index e9b001878b..7e56153421 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/card_view_test.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/card_view_test.ts @@ -24,7 +24,6 @@ import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Action, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; - import {State} from '../../../app_state'; import * as selectors from '../../../selectors'; import {RunColorScale} from '../../../types/ui'; diff --git a/tensorboard/webapp/metrics/views/card_renderer/data_download_dialog_component.ts b/tensorboard/webapp/metrics/views/card_renderer/data_download_dialog_component.ts index b9f551dab4..a81164d5cc 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/data_download_dialog_component.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/data_download_dialog_component.ts @@ -19,10 +19,9 @@ import { Input, Output, } from '@angular/core'; - import {Run} from '../../../runs/types'; -import {CardMetadata} from '../../types'; import {PluginType} from '../../data_source/types'; +import {CardMetadata} from '../../types'; @Component({ selector: 'data_download_dialog_component', diff --git a/tensorboard/webapp/metrics/views/card_renderer/data_download_dialog_container.ts b/tensorboard/webapp/metrics/views/card_renderer/data_download_dialog_container.ts index 6698cb3108..b20f3e4f26 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/data_download_dialog_container.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/data_download_dialog_container.ts @@ -15,9 +15,8 @@ limitations under the License. import {ChangeDetectionStrategy, Component, Inject} from '@angular/core'; import {MAT_DIALOG_DATA} from '@angular/material/dialog'; import {Store} from '@ngrx/store'; -import {Observable, BehaviorSubject, combineLatest} from 'rxjs'; -import {filter, startWith, map} from 'rxjs/operators'; - +import {BehaviorSubject, combineLatest, Observable} from 'rxjs'; +import {filter, map, startWith} from 'rxjs/operators'; import {State} from '../../../app_state'; import {Run} from '../../../runs/types'; import { diff --git a/tensorboard/webapp/metrics/views/card_renderer/data_download_dialog_test.ts b/tensorboard/webapp/metrics/views/card_renderer/data_download_dialog_test.ts index 8b93dd71d7..25bf51cfa6 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/data_download_dialog_test.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/data_download_dialog_test.ts @@ -20,7 +20,6 @@ import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; - import {State} from '../../../app_state'; import {Run} from '../../../runs/store/runs_types'; import {buildRun} from '../../../runs/store/testing'; diff --git a/tensorboard/webapp/metrics/views/card_renderer/data_download_module.ts b/tensorboard/webapp/metrics/views/card_renderer/data_download_module.ts index 153c2fd816..22120fce63 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/data_download_module.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/data_download_module.ts @@ -19,7 +19,6 @@ import {MatButtonModule} from '@angular/material/button'; import {MatDialogModule} from '@angular/material/dialog'; import {MatInputModule} from '@angular/material/input'; import {MatSelectModule} from '@angular/material/select'; - import {MetricsDataSourceModule} from '../../data_source'; import {DataDownloadDialogComponent} from './data_download_dialog_component'; import {DataDownloadDialogContainer} from './data_download_dialog_container'; diff --git a/tensorboard/webapp/metrics/views/card_renderer/histogram_card_container.ts b/tensorboard/webapp/metrics/views/card_renderer/histogram_card_container.ts index 6b7e980c4c..778cf7cacb 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/histogram_card_container.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/histogram_card_container.ts @@ -21,11 +21,10 @@ import { Output, } from '@angular/core'; import {Store} from '@ngrx/store'; -import {DataLoadState} from '../../../types/data'; import {combineLatest, Observable} from 'rxjs'; import {combineLatestWith, filter, map} from 'rxjs/operators'; - import {State} from '../../../app_state'; +import {DataLoadState} from '../../../types/data'; import {RunColorScale} from '../../../types/ui'; import {HistogramDatum} from '../../../widgets/histogram/histogram_types'; import {buildNormalizedHistograms} from '../../../widgets/histogram/histogram_util'; @@ -39,7 +38,7 @@ import { getMetricsSelectedTime, getMetricsXAxisType, } from '../../store'; -import {CardId, CardMetadata, LinkedTime} from '../../types'; +import {CardId, CardMetadata} from '../../types'; import {CardRenderer} from '../metrics_view_types'; import {getTagDisplayName} from '../utils'; import {maybeClipSelectedTime, ViewSelectedTime} from './utils'; diff --git a/tensorboard/webapp/metrics/views/card_renderer/histogram_card_module.ts b/tensorboard/webapp/metrics/views/card_renderer/histogram_card_module.ts index fcbc1633c5..b28ec740b9 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/histogram_card_module.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/histogram_card_module.ts @@ -14,13 +14,11 @@ limitations under the License. ==============================================================================*/ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {MatButtonModule} from '@angular/material/button'; import {MatIconModule} from '@angular/material/icon'; import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import {HistogramModule} from '../../../widgets/histogram/histogram_module'; import {TruncatedPathModule} from '../../../widgets/text/truncated_path_module'; - import {HistogramCardComponent} from './histogram_card_component'; import {HistogramCardContainer} from './histogram_card_container'; import {RunNameModule} from './run_name_module'; diff --git a/tensorboard/webapp/metrics/views/card_renderer/histogram_card_test.ts b/tensorboard/webapp/metrics/views/card_renderer/histogram_card_test.ts index 78633d025b..15180be4af 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/histogram_card_test.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/histogram_card_test.ts @@ -20,14 +20,13 @@ import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../app_state'; -import {DataLoadState} from '../../../types/data'; - import { getExperimentIdForRunId, getExperimentIdToExperimentAliasMap, getRun, } from '../../../selectors'; import {MatIconTestingModule} from '../../../testing/mat_icon_module'; +import {DataLoadState} from '../../../types/data'; import { HistogramData, HistogramMode, @@ -44,7 +43,6 @@ import { provideMockCardSeriesData, } from '../../testing'; import {XAxisType} from '../../types'; - import {HistogramCardComponent} from './histogram_card_component'; import {HistogramCardContainer} from './histogram_card_container'; import {RunNameModule} from './run_name_module'; diff --git a/tensorboard/webapp/metrics/views/card_renderer/image_card_component.ts b/tensorboard/webapp/metrics/views/card_renderer/image_card_component.ts index 45f1a9ddc5..d13837f53e 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/image_card_component.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/image_card_component.ts @@ -20,7 +20,6 @@ import { Output, } from '@angular/core'; import {DataLoadState} from '../../../types/data'; - import {RunColorScale} from '../../../types/ui'; @Component({ diff --git a/tensorboard/webapp/metrics/views/card_renderer/image_card_container.ts b/tensorboard/webapp/metrics/views/card_renderer/image_card_container.ts index 8a8c6370b5..07cd1847bd 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/image_card_container.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/image_card_container.ts @@ -22,7 +22,6 @@ import { Output, } from '@angular/core'; import {Store} from '@ngrx/store'; -import {DataLoadState} from '../../../types/data'; import {BehaviorSubject, combineLatest, Observable, Subject} from 'rxjs'; import { distinctUntilChanged, @@ -32,8 +31,8 @@ import { takeUntil, tap, } from 'rxjs/operators'; - import {State} from '../../../app_state'; +import {DataLoadState} from '../../../types/data'; import {RunColorScale} from '../../../types/ui'; import * as actions from '../../actions'; import { diff --git a/tensorboard/webapp/metrics/views/card_renderer/image_card_module.ts b/tensorboard/webapp/metrics/views/card_renderer/image_card_module.ts index 4908183a5b..6b4ed37cfa 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/image_card_module.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/image_card_module.ts @@ -18,7 +18,6 @@ import {MatButtonModule} from '@angular/material/button'; import {MatIconModule} from '@angular/material/icon'; import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import {MatSliderModule} from '@angular/material/slider'; - import {TruncatedPathModule} from '../../../widgets/text/truncated_path_module'; import {ImageCardComponent} from './image_card_component'; import {ImageCardContainer} from './image_card_container'; diff --git a/tensorboard/webapp/metrics/views/card_renderer/image_card_test.ts b/tensorboard/webapp/metrics/views/card_renderer/image_card_test.ts index 98b723a64a..8648f24653 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/image_card_test.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/image_card_test.ts @@ -22,25 +22,23 @@ import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Action, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../app_state'; -import {DataLoadState} from '../../../types/data'; - -import {MatIconTestingModule} from '../../../testing/mat_icon_module'; -import {TruncatedPathModule} from '../../../widgets/text/truncated_path_module'; -import * as actions from '../../actions'; -import {ImageId, MetricsDataSource, PluginType} from '../../data_source'; -import * as selectors from '../../store/metrics_selectors'; import { getExperimentIdForRunId, getExperimentIdToExperimentAliasMap, getRun, } from '../../../selectors'; +import {MatIconTestingModule} from '../../../testing/mat_icon_module'; +import {DataLoadState} from '../../../types/data'; +import {TruncatedPathModule} from '../../../widgets/text/truncated_path_module'; +import * as actions from '../../actions'; +import {ImageId, MetricsDataSource, PluginType} from '../../data_source'; +import * as selectors from '../../store/metrics_selectors'; import { appStateFromMetricsState, buildMetricsState, provideMockCardSeriesData, } from '../../testing'; import {CardId} from '../../types'; - import {ImageCardComponent} from './image_card_component'; import {ImageCardContainer} from './image_card_container'; import {RunNameModule} from './run_name_module'; diff --git a/tensorboard/webapp/metrics/views/card_renderer/run_name_component.ts b/tensorboard/webapp/metrics/views/card_renderer/run_name_component.ts index b78d2dd903..c281bfabe2 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/run_name_component.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/run_name_component.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; - import {ExperimentAlias} from '../../../experiments/types'; @Component({ diff --git a/tensorboard/webapp/metrics/views/card_renderer/run_name_container.ts b/tensorboard/webapp/metrics/views/card_renderer/run_name_container.ts index 5c9b81efc0..725e4f0cd7 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/run_name_container.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/run_name_container.ts @@ -16,7 +16,6 @@ import {ChangeDetectionStrategy, Component, Input, OnInit} from '@angular/core'; import {Store} from '@ngrx/store'; import {combineLatest, Observable} from 'rxjs'; import {map} from 'rxjs/operators'; - import {State} from '../../../app_state'; import {ExperimentAlias} from '../../../experiments/types'; import { @@ -24,7 +23,6 @@ import { getExperimentIdToExperimentAliasMap, getRun, } from '../../../selectors'; - import {getDisplayNameForRun} from './utils'; @Component({ diff --git a/tensorboard/webapp/metrics/views/card_renderer/run_name_module.ts b/tensorboard/webapp/metrics/views/card_renderer/run_name_module.ts index 286841f8e3..c1378ab0f6 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/run_name_module.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/run_name_module.ts @@ -14,10 +14,9 @@ limitations under the License. ==============================================================================*/ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - +import {ExperimentAliasModule} from '../../../widgets/experiment_alias/experiment_alias_module'; import {RunNameComponent} from './run_name_component'; import {RunNameContainer} from './run_name_container'; -import {ExperimentAliasModule} from '../../../widgets/experiment_alias/experiment_alias_module'; @NgModule({ declarations: [RunNameContainer, RunNameComponent], diff --git a/tensorboard/webapp/metrics/views/card_renderer/run_name_test.ts b/tensorboard/webapp/metrics/views/card_renderer/run_name_test.ts index 5a4eb87b28..7bfc26b96e 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/run_name_test.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/run_name_test.ts @@ -17,15 +17,13 @@ import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../app_state'; - import {buildRun} from '../../../runs/store/testing'; -import {ExperimentAliasModule} from '../../../widgets/experiment_alias/experiment_alias_module'; import { getExperimentIdForRunId, getExperimentIdToExperimentAliasMap, getRun, } from '../../../selectors'; - +import {ExperimentAliasModule} from '../../../widgets/experiment_alias/experiment_alias_module'; import {RunNameComponent} from './run_name_component'; import {RunNameContainer} from './run_name_container'; diff --git a/tensorboard/webapp/metrics/views/card_renderer/scalar_card_component.ts b/tensorboard/webapp/metrics/views/card_renderer/scalar_card_component.ts index 3465322885..789d9b534b 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/scalar_card_component.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/scalar_card_component.ts @@ -23,13 +23,12 @@ import { ViewChild, } from '@angular/core'; import {MatDialog} from '@angular/material/dialog'; - import {DataLoadState} from '../../../types/data'; import { Formatter, + intlNumberFormatter, numberFormatter, relativeTimeFormatter, - intlNumberFormatter, siNumberFormatter, } from '../../../widgets/line_chart_v2/lib/formatter'; import {LineChartComponent} from '../../../widgets/line_chart_v2/line_chart_component'; diff --git a/tensorboard/webapp/metrics/views/card_renderer/scalar_card_container.ts b/tensorboard/webapp/metrics/views/card_renderer/scalar_card_container.ts index 6329e6156e..a88676a9f0 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/scalar_card_container.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/scalar_card_container.ts @@ -35,7 +35,6 @@ import { switchMap, takeUntil, } from 'rxjs/operators'; - import {State} from '../../../app_state'; import {ExperimentAlias} from '../../../experiments/types'; import { diff --git a/tensorboard/webapp/metrics/views/card_renderer/scalar_card_module.ts b/tensorboard/webapp/metrics/views/card_renderer/scalar_card_module.ts index e41077283f..e8bd03c208 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/scalar_card_module.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/scalar_card_module.ts @@ -18,7 +18,6 @@ import {MatButtonModule} from '@angular/material/button'; import {MatIconModule} from '@angular/material/icon'; import {MatMenuModule} from '@angular/material/menu'; import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; - 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'; diff --git a/tensorboard/webapp/metrics/views/card_renderer/scalar_card_test.ts b/tensorboard/webapp/metrics/views/card_renderer/scalar_card_test.ts index c57e23a072..288bfa060d 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/scalar_card_test.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/scalar_card_test.ts @@ -38,7 +38,6 @@ import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {Observable, of, ReplaySubject} from 'rxjs'; - import {State} from '../../../app_state'; import {ExperimentAlias} from '../../../experiments/types'; import {Run} from '../../../runs/store/runs_types'; diff --git a/tensorboard/webapp/metrics/views/card_renderer/utils_test.ts b/tensorboard/webapp/metrics/views/card_renderer/utils_test.ts index e609f4bca8..b32d82cb96 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/utils_test.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/utils_test.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {buildRun} from '../../../runs/store/testing'; import {PartialSeries} from './scalar_card_types'; - import {getDisplayNameForRun, partitionSeries} from './utils'; describe('metrics card_renderer utils test', () => { diff --git a/tensorboard/webapp/metrics/views/card_renderer/vis_selected_time_clipped_component.ts b/tensorboard/webapp/metrics/views/card_renderer/vis_selected_time_clipped_component.ts index 133c155949..46c9bce6bc 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/vis_selected_time_clipped_component.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/vis_selected_time_clipped_component.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; - import {LinkedTime} from '../../types'; export type LinkedTimeWithClipped = LinkedTime & {clipped: boolean}; diff --git a/tensorboard/webapp/metrics/views/card_renderer/vis_selected_time_clipped_module.ts b/tensorboard/webapp/metrics/views/card_renderer/vis_selected_time_clipped_module.ts index 78fe1cfcf8..160f62f64e 100644 --- a/tensorboard/webapp/metrics/views/card_renderer/vis_selected_time_clipped_module.ts +++ b/tensorboard/webapp/metrics/views/card_renderer/vis_selected_time_clipped_module.ts @@ -15,7 +15,6 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {MatIconModule} from '@angular/material/icon'; - import {VisSelectedTimeClippedComponent} from './vis_selected_time_clipped_component'; @NgModule({ diff --git a/tensorboard/webapp/metrics/views/main_view/card_grid_component.ts b/tensorboard/webapp/metrics/views/main_view/card_grid_component.ts index 7d89c9a71e..377e22bb63 100644 --- a/tensorboard/webapp/metrics/views/main_view/card_grid_component.ts +++ b/tensorboard/webapp/metrics/views/main_view/card_grid_component.ts @@ -22,10 +22,8 @@ import { Output, SimpleChanges, } from '@angular/core'; - import {PluginType} from '../../data_source'; import {CardObserver} from '../card_renderer/card_lazy_loader'; - import {CardIdWithMetadata} from '../metrics_view_types'; const MIN_CARD_MIN_WIDTH_IN_PX = 335; diff --git a/tensorboard/webapp/metrics/views/main_view/card_grid_container.ts b/tensorboard/webapp/metrics/views/main_view/card_grid_container.ts index 6fc5befd8f..a7cdb70829 100644 --- a/tensorboard/webapp/metrics/views/main_view/card_grid_container.ts +++ b/tensorboard/webapp/metrics/views/main_view/card_grid_container.ts @@ -21,16 +21,15 @@ import { SimpleChanges, } from '@angular/core'; import {Store} from '@ngrx/store'; -import {selectors as settingsSelectors} from '../../../settings'; import {BehaviorSubject, combineLatest, Observable, of, Subject} from 'rxjs'; import {map, shareReplay, switchMap, takeUntil, tap} from 'rxjs/operators'; - import {State} from '../../../app_state'; import { + getEnabledCardWidthSetting, getMetricsCardMinWidth, getMetricsTagGroupExpansionState, - getEnabledCardWidthSetting, } from '../../../selectors'; +import {selectors as settingsSelectors} from '../../../settings'; import {CardObserver} from '../card_renderer/card_lazy_loader'; import {CardIdWithMetadata} from '../metrics_view_types'; diff --git a/tensorboard/webapp/metrics/views/main_view/card_grid_test.ts b/tensorboard/webapp/metrics/views/main_view/card_grid_test.ts index 179a79ca47..38f37568da 100644 --- a/tensorboard/webapp/metrics/views/main_view/card_grid_test.ts +++ b/tensorboard/webapp/metrics/views/main_view/card_grid_test.ts @@ -20,23 +20,22 @@ import { TestBed, tick, } from '@angular/core/testing'; -import {PluginType} from '../../data_source'; import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; - -import {CardGridComponent} from './card_grid_component'; -import {CardGridContainer} from './card_grid_container'; -import {CardIdWithMetadata} from '../metrics_view_types'; import {Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../app_state'; -import {selectors as settingsSelectors} from '../../../settings'; import * as selectors from '../../../selectors'; import { getEnabledCardWidthSetting, getMetricsCardMinWidth, getMetricsTagGroupExpansionState, } from '../../../selectors'; +import {selectors as settingsSelectors} from '../../../settings'; +import {PluginType} from '../../data_source'; +import {CardIdWithMetadata} from '../metrics_view_types'; +import {CardGridComponent} from './card_grid_component'; +import {CardGridContainer} from './card_grid_container'; const scrollElementHeight = 100; diff --git a/tensorboard/webapp/metrics/views/main_view/card_group_toolbar_container.ts b/tensorboard/webapp/metrics/views/main_view/card_group_toolbar_container.ts index f2a4d7aeed..a09d6cbd67 100644 --- a/tensorboard/webapp/metrics/views/main_view/card_group_toolbar_container.ts +++ b/tensorboard/webapp/metrics/views/main_view/card_group_toolbar_container.ts @@ -12,21 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import { - ChangeDetectionStrategy, - Component, - Input, - SimpleChanges, - OnChanges, - OnDestroy, -} from '@angular/core'; +import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; import {Store} from '@ngrx/store'; -import {BehaviorSubject, Observable, of, Subject} from 'rxjs'; -import {switchMap} from 'rxjs/operators'; - +import {Observable, of} from 'rxjs'; import {State} from '../../../app_state'; -import {metricsTagGroupExpansionChanged} from '../../actions'; import {getMetricsTagGroupExpansionState} from '../../../selectors'; +import {metricsTagGroupExpansionChanged} from '../../actions'; @Component({ selector: 'metrics-card-group-toolbar', diff --git a/tensorboard/webapp/metrics/views/main_view/card_groups_component.ts b/tensorboard/webapp/metrics/views/main_view/card_groups_component.ts index 29646a244a..11d2d3bb6f 100644 --- a/tensorboard/webapp/metrics/views/main_view/card_groups_component.ts +++ b/tensorboard/webapp/metrics/views/main_view/card_groups_component.ts @@ -13,10 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; - import {PluginType} from '../../data_source'; import {CardObserver} from '../card_renderer/card_lazy_loader'; - import {CardGroup} from '../metrics_view_types'; @Component({ diff --git a/tensorboard/webapp/metrics/views/main_view/card_groups_container.ts b/tensorboard/webapp/metrics/views/main_view/card_groups_container.ts index 6b061d682a..29dc1a39e8 100644 --- a/tensorboard/webapp/metrics/views/main_view/card_groups_container.ts +++ b/tensorboard/webapp/metrics/views/main_view/card_groups_container.ts @@ -16,12 +16,11 @@ import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; import {Store} from '@ngrx/store'; import {Observable} from 'rxjs'; import {combineLatestWith, map} from 'rxjs/operators'; - import {State} from '../../../app_state'; import {getMetricsFilteredPluginTypes} from '../../store'; +import {groupCardIdWithMetdata} from '../../utils'; import {CardObserver} from '../card_renderer/card_lazy_loader'; import {CardGroup} from '../metrics_view_types'; -import {groupCardIdWithMetdata} from '../../utils'; import {getSortedRenderableCardIdsWithMetadata} from './common_selectors'; @Component({ diff --git a/tensorboard/webapp/metrics/views/main_view/common_selectors.ts b/tensorboard/webapp/metrics/views/main_view/common_selectors.ts index 663feb42c0..c773f4f7b3 100644 --- a/tensorboard/webapp/metrics/views/main_view/common_selectors.ts +++ b/tensorboard/webapp/metrics/views/main_view/common_selectors.ts @@ -13,14 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {createSelector} from '@ngrx/store'; - import {State} from '../../../app_state'; import {getCurrentRouteRunSelection} from '../../../selectors'; import {DeepReadonly} from '../../../util/types'; import {isSingleRunPlugin} from '../../data_source'; import {getNonEmptyCardIdsWithMetadata} from '../../store'; -import {CardIdWithMetadata} from '../metrics_view_types'; import {compareTagNames} from '../../utils'; +import {CardIdWithMetadata} from '../metrics_view_types'; const getRenderableCardIdsWithMetadata = createSelector< State, diff --git a/tensorboard/webapp/metrics/views/main_view/empty_tag_match_message_component.ts b/tensorboard/webapp/metrics/views/main_view/empty_tag_match_message_component.ts index d691560b8e..e2a80ccfc5 100644 --- a/tensorboard/webapp/metrics/views/main_view/empty_tag_match_message_component.ts +++ b/tensorboard/webapp/metrics/views/main_view/empty_tag_match_message_component.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; - import {PluginType} from '../../data_source'; declare namespace Intl { diff --git a/tensorboard/webapp/metrics/views/main_view/empty_tag_match_message_container.ts b/tensorboard/webapp/metrics/views/main_view/empty_tag_match_message_container.ts index 86d4f0ecf0..ce43fec325 100644 --- a/tensorboard/webapp/metrics/views/main_view/empty_tag_match_message_container.ts +++ b/tensorboard/webapp/metrics/views/main_view/empty_tag_match_message_container.ts @@ -16,7 +16,6 @@ import {ChangeDetectionStrategy, Component} from '@angular/core'; import {Store} from '@ngrx/store'; import {Observable} from 'rxjs'; import {map} from 'rxjs/operators'; - import {State} from '../../../app_state'; import {PluginType} from '../../data_source'; import {getMetricsFilteredPluginTypes, getMetricsTagFilter} from '../../store'; diff --git a/tensorboard/webapp/metrics/views/main_view/filter_input_component.ts b/tensorboard/webapp/metrics/views/main_view/filter_input_component.ts index a0b639e08e..c88aee2411 100644 --- a/tensorboard/webapp/metrics/views/main_view/filter_input_component.ts +++ b/tensorboard/webapp/metrics/views/main_view/filter_input_component.ts @@ -20,7 +20,6 @@ import { Input, Output, } from '@angular/core'; - import {escapeForRegex} from '../../../util/string'; @Component({ diff --git a/tensorboard/webapp/metrics/views/main_view/filter_input_container.ts b/tensorboard/webapp/metrics/views/main_view/filter_input_container.ts index 9f01be7c79..e14afacfed 100644 --- a/tensorboard/webapp/metrics/views/main_view/filter_input_container.ts +++ b/tensorboard/webapp/metrics/views/main_view/filter_input_container.ts @@ -16,7 +16,6 @@ import {ChangeDetectionStrategy, Component} from '@angular/core'; import {Store} from '@ngrx/store'; import {Observable} from 'rxjs'; import {combineLatestWith, filter, map} from 'rxjs/operators'; - import {State} from '../../../app_state'; import { getMetricsTagFilter, diff --git a/tensorboard/webapp/metrics/views/main_view/filter_input_test.ts b/tensorboard/webapp/metrics/views/main_view/filter_input_test.ts index fb4fc765ea..95c01b5528 100644 --- a/tensorboard/webapp/metrics/views/main_view/filter_input_test.ts +++ b/tensorboard/webapp/metrics/views/main_view/filter_input_test.ts @@ -21,17 +21,15 @@ import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Action, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; - import {State} from '../../../app_state'; import {sendKeys} from '../../../testing/dom'; -import {MatIconTestingModule} from '../../../testing/mat_icon_module'; import {getAutocompleteOptions} from '../../../testing/material'; +import {MatIconTestingModule} from '../../../testing/mat_icon_module'; import {FilterInputModule} from '../../../widgets/filter_input/filter_input_module'; import {metricsTagFilterChanged} from '../../actions'; import {PluginType} from '../../data_source'; import * as selectors from '../../store/metrics_selectors'; import {appStateFromMetricsState, buildMetricsState} from '../../testing'; - import {MetricsFilterInputComponent} from './filter_input_component'; import {MetricsFilterInputContainer} from './filter_input_container'; diff --git a/tensorboard/webapp/metrics/views/main_view/filtered_view_component.ts b/tensorboard/webapp/metrics/views/main_view/filtered_view_component.ts index 0605ada186..c96af8f0db 100644 --- a/tensorboard/webapp/metrics/views/main_view/filtered_view_component.ts +++ b/tensorboard/webapp/metrics/views/main_view/filtered_view_component.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; - import {CardObserver} from '../card_renderer/card_lazy_loader'; import {CardIdWithMetadata} from '../metrics_view_types'; diff --git a/tensorboard/webapp/metrics/views/main_view/filtered_view_container.ts b/tensorboard/webapp/metrics/views/main_view/filtered_view_container.ts index bd5e7a14de..dc4d5f2166 100644 --- a/tensorboard/webapp/metrics/views/main_view/filtered_view_container.ts +++ b/tensorboard/webapp/metrics/views/main_view/filtered_view_container.ts @@ -24,7 +24,6 @@ import { share, startWith, } from 'rxjs/operators'; - import {State} from '../../../app_state'; import {DeepReadonly} from '../../../util/types'; import {getMetricsFilteredPluginTypes, getMetricsTagFilter} from '../../store'; diff --git a/tensorboard/webapp/metrics/views/main_view/main_view_component.ts b/tensorboard/webapp/metrics/views/main_view/main_view_component.ts index 29e6474ca1..6a4e891093 100644 --- a/tensorboard/webapp/metrics/views/main_view/main_view_component.ts +++ b/tensorboard/webapp/metrics/views/main_view/main_view_component.ts @@ -20,7 +20,6 @@ import { Input, Output, } from '@angular/core'; - import {PluginType} from '../../types'; import {CardObserver} from '../card_renderer/card_lazy_loader'; diff --git a/tensorboard/webapp/metrics/views/main_view/main_view_container.ts b/tensorboard/webapp/metrics/views/main_view/main_view_container.ts index fc54389511..473fc15557 100644 --- a/tensorboard/webapp/metrics/views/main_view/main_view_container.ts +++ b/tensorboard/webapp/metrics/views/main_view/main_view_container.ts @@ -16,12 +16,11 @@ import {ChangeDetectionStrategy, Component} from '@angular/core'; import {Store} from '@ngrx/store'; import {Observable} from 'rxjs'; import {map, takeWhile} from 'rxjs/operators'; - import {State} from '../../../app_state'; import {DataLoadState} from '../../../types/data'; import { - metricsSettingsPaneToggled, metricsSettingsPaneClosed, + metricsSettingsPaneToggled, metricsShowAllPlugins, metricsToggleVisiblePlugin, } from '../../actions'; diff --git a/tensorboard/webapp/metrics/views/main_view/main_view_module.ts b/tensorboard/webapp/metrics/views/main_view/main_view_module.ts index d1b919eb52..f04fc34c80 100644 --- a/tensorboard/webapp/metrics/views/main_view/main_view_module.ts +++ b/tensorboard/webapp/metrics/views/main_view/main_view_module.ts @@ -21,7 +21,6 @@ import {MatButtonToggleModule} from '@angular/material/button-toggle'; import {MatIconModule} from '@angular/material/icon'; import {MatInputModule} from '@angular/material/input'; import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; - import {FilterInputModule} from '../../../widgets/filter_input/filter_input_module'; import {CardRendererModule} from '../card_renderer/card_renderer_module'; import {RightPaneModule} from '../right_pane/right_pane_module'; diff --git a/tensorboard/webapp/metrics/views/main_view/main_view_test.ts b/tensorboard/webapp/metrics/views/main_view/main_view_test.ts index 12493306ab..1fb5df26e6 100644 --- a/tensorboard/webapp/metrics/views/main_view/main_view_test.ts +++ b/tensorboard/webapp/metrics/views/main_view/main_view_test.ts @@ -29,16 +29,16 @@ import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Action, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; -import {State} from '../../../app_state'; -import {selectors as settingsSelectors} from '../../../settings'; import {of, ReplaySubject} from 'rxjs'; - +import {State} from '../../../app_state'; import * as selectors from '../../../selectors'; import { getMetricsCardMinWidth, getMetricsTagGroupExpansionState, } from '../../../selectors'; +import {selectors as settingsSelectors} from '../../../settings'; import {KeyType, sendKey, sendKeys} from '../../../testing/dom'; +import {DataLoadState} from '../../../types/data'; import {RunColorScale} from '../../../types/ui'; import * as actions from '../../actions'; import {PluginType} from '../../data_source'; @@ -49,7 +49,7 @@ import { } from '../../testing'; import {CardId} from '../../types'; import {CardLazyLoader, CardObserver} from '../card_renderer/card_lazy_loader'; - +import {CardIdWithMetadata} from '../metrics_view_types'; import {CardGridComponent} from './card_grid_component'; import {CardGridContainer} from './card_grid_container'; import {CardGroupsComponent} from './card_groups_component'; @@ -67,8 +67,6 @@ import {MainViewComponent} from './main_view_component'; import {MainViewContainer} from './main_view_container'; import {PinnedViewComponent} from './pinned_view_component'; import {PinnedViewContainer} from './pinned_view_container'; -import {DataLoadState} from '../../../types/data'; -import {CardIdWithMetadata} from '../metrics_view_types'; @Component({ selector: 'card-view', diff --git a/tensorboard/webapp/metrics/views/main_view/pinned_view_container.ts b/tensorboard/webapp/metrics/views/main_view/pinned_view_container.ts index 505b298e6f..124a454b42 100644 --- a/tensorboard/webapp/metrics/views/main_view/pinned_view_container.ts +++ b/tensorboard/webapp/metrics/views/main_view/pinned_view_container.ts @@ -16,7 +16,6 @@ import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; import {Store} from '@ngrx/store'; import {Observable} from 'rxjs'; import {filter, map, pairwise, skip, startWith} from 'rxjs/operators'; - import {State} from '../../../app_state'; import {DeepReadonly} from '../../../util/types'; import {getPinnedCardsWithMetadata} from '../../store'; diff --git a/tensorboard/webapp/metrics/views/metrics_container.ts b/tensorboard/webapp/metrics/views/metrics_container.ts index dd2c2f6fb8..46b0d86594 100644 --- a/tensorboard/webapp/metrics/views/metrics_container.ts +++ b/tensorboard/webapp/metrics/views/metrics_container.ts @@ -16,7 +16,6 @@ import {ChangeDetectionStrategy, Component} from '@angular/core'; import {Store} from '@ngrx/store'; import {Observable} from 'rxjs'; import {combineLatestWith, map} from 'rxjs/operators'; - import {State} from '../../app_state'; import { getIsTimeSeriesPromotionEnabled, diff --git a/tensorboard/webapp/metrics/views/metrics_container_test.ts b/tensorboard/webapp/metrics/views/metrics_container_test.ts index 2c29fbb09a..a510c85197 100644 --- a/tensorboard/webapp/metrics/views/metrics_container_test.ts +++ b/tensorboard/webapp/metrics/views/metrics_container_test.ts @@ -18,7 +18,6 @@ import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Action, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; - import {State} from '../../app_state'; import { getIsTimeSeriesPromotionEnabled, diff --git a/tensorboard/webapp/metrics/views/metrics_promo_notice_container.ts b/tensorboard/webapp/metrics/views/metrics_promo_notice_container.ts index 6ed0eb23eb..2dc2564da5 100644 --- a/tensorboard/webapp/metrics/views/metrics_promo_notice_container.ts +++ b/tensorboard/webapp/metrics/views/metrics_promo_notice_container.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {ChangeDetectionStrategy, Component} from '@angular/core'; import {Store} from '@ngrx/store'; - import {State} from '../../app_state'; import {metricsPromoDismissed, metricsPromoGoToScalars} from '../actions'; diff --git a/tensorboard/webapp/metrics/views/metrics_views_module.ts b/tensorboard/webapp/metrics/views/metrics_views_module.ts index 16249c2d4c..ed98160c1d 100644 --- a/tensorboard/webapp/metrics/views/metrics_views_module.ts +++ b/tensorboard/webapp/metrics/views/metrics_views_module.ts @@ -15,7 +15,6 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {MatIconModule} from '@angular/material/icon'; - import {LayoutModule} from '../../core'; import {CustomizationModule} from '../../customization/customization_module'; import {RunsSelectorModule} from '../../runs/views/runs_selector/runs_selector_module'; diff --git a/tensorboard/webapp/metrics/views/right_pane/right_pane_module.ts b/tensorboard/webapp/metrics/views/right_pane/right_pane_module.ts index baa1b1a69a..06e8efa53f 100644 --- a/tensorboard/webapp/metrics/views/right_pane/right_pane_module.ts +++ b/tensorboard/webapp/metrics/views/right_pane/right_pane_module.ts @@ -20,7 +20,6 @@ import {MatCheckboxModule} from '@angular/material/checkbox'; import {MatIconModule} from '@angular/material/icon'; import {MatSelectModule} from '@angular/material/select'; import {MatSliderModule} from '@angular/material/slider'; - import {FeatureFlagModule} from '../../../feature_flag/feature_flag_module'; import {DropdownModule} from '../../../widgets/dropdown/dropdown_module'; import {RangeInputModule} from '../../../widgets/range_input/range_input_module'; diff --git a/tensorboard/webapp/metrics/views/right_pane/right_pane_test.ts b/tensorboard/webapp/metrics/views/right_pane/right_pane_test.ts index a6764676b4..7d8e1cdd5a 100644 --- a/tensorboard/webapp/metrics/views/right_pane/right_pane_test.ts +++ b/tensorboard/webapp/metrics/views/right_pane/right_pane_test.ts @@ -27,13 +27,11 @@ import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; - import {State} from '../../../app_state'; +import * as selectors from '../../../selectors'; import {DropdownModule} from '../../../widgets/dropdown/dropdown_module'; import * as actions from '../../actions'; -import * as selectors from '../../../selectors'; import {HistogramMode, TooltipSort, XAxisType} from '../../types'; - import {RightPaneComponent} from './right_pane_component'; import {SettingsViewComponent, TEST_ONLY} from './settings_view_component'; import {SettingsViewContainer} from './settings_view_container'; diff --git a/tensorboard/webapp/metrics/views/right_pane/settings_view_component.ts b/tensorboard/webapp/metrics/views/right_pane/settings_view_component.ts index c15da9eb5c..df0cda07c1 100644 --- a/tensorboard/webapp/metrics/views/right_pane/settings_view_component.ts +++ b/tensorboard/webapp/metrics/views/right_pane/settings_view_component.ts @@ -23,13 +23,12 @@ import { Output, } from '@angular/core'; import {auditTime} from 'rxjs/operators'; - import {DropdownOption} from '../../../widgets/dropdown/dropdown_component'; import { HistogramMode, + LinkedTime, SCALARS_SMOOTHING_MAX, TooltipSort, - LinkedTime, XAxisType, } from '../../types'; diff --git a/tensorboard/webapp/metrics/views/right_pane/settings_view_container.ts b/tensorboard/webapp/metrics/views/right_pane/settings_view_container.ts index 2ecdea933a..0370a9af9a 100644 --- a/tensorboard/webapp/metrics/views/right_pane/settings_view_container.ts +++ b/tensorboard/webapp/metrics/views/right_pane/settings_view_container.ts @@ -14,20 +14,19 @@ limitations under the License. ==============================================================================*/ import {ChangeDetectionStrategy, Component} from '@angular/core'; import {Store} from '@ngrx/store'; -import {Observable, of} from 'rxjs'; +import {Observable} from 'rxjs'; import {filter, map, take, withLatestFrom} from 'rxjs/operators'; - import {State} from '../../../app_state'; import * as selectors from '../../../selectors'; import { metricsChangeCardWidth, - metricsResetCardWidth, metricsChangeHistogramMode, metricsChangeImageBrightness, metricsChangeImageContrast, metricsChangeScalarSmoothing, metricsChangeTooltipSort, metricsChangeXAxisType, + metricsResetCardWidth, metricsResetImageBrightness, metricsResetImageContrast, metricsScalarPartitionNonMonotonicXToggled, diff --git a/tensorboard/webapp/notification_center/_data_source/index.ts b/tensorboard/webapp/notification_center/_data_source/index.ts index 5d9753d046..1cf76e81cf 100644 --- a/tensorboard/webapp/notification_center/_data_source/index.ts +++ b/tensorboard/webapp/notification_center/_data_source/index.ts @@ -12,6 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +export * from './backend_types'; export * from './notification_center_data_source'; export * from './notification_center_data_source_module'; -export * from './backend_types'; diff --git a/tensorboard/webapp/notification_center/_data_source/notification_center_data_source.ts b/tensorboard/webapp/notification_center/_data_source/notification_center_data_source.ts index 28f190b94b..4caafd6e02 100644 --- a/tensorboard/webapp/notification_center/_data_source/notification_center_data_source.ts +++ b/tensorboard/webapp/notification_center/_data_source/notification_center_data_source.ts @@ -15,7 +15,6 @@ limitations under the License. import {Injectable} from '@angular/core'; import {Observable} from 'rxjs'; import {map} from 'rxjs/operators'; - import {TBHttpClient} from '../../webapp_data_source/tb_http_client'; import { NotificationCenterDataSource, diff --git a/tensorboard/webapp/notification_center/_data_source/notification_center_data_source_module.ts b/tensorboard/webapp/notification_center/_data_source/notification_center_data_source_module.ts index c796043632..43739beea4 100644 --- a/tensorboard/webapp/notification_center/_data_source/notification_center_data_source_module.ts +++ b/tensorboard/webapp/notification_center/_data_source/notification_center_data_source_module.ts @@ -13,10 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - import {TBHttpClientModule} from '../../webapp_data_source/tb_http_client_module'; -import {TBNotificationCenterDataSource} from './notification_center_data_source'; import {NotificationCenterDataSource} from './backend_types'; +import {TBNotificationCenterDataSource} from './notification_center_data_source'; @NgModule({ imports: [TBHttpClientModule], diff --git a/tensorboard/webapp/notification_center/_data_source/notification_center_data_source_test.ts b/tensorboard/webapp/notification_center/_data_source/notification_center_data_source_test.ts index 4f90176497..4e93e967ca 100644 --- a/tensorboard/webapp/notification_center/_data_source/notification_center_data_source_test.ts +++ b/tensorboard/webapp/notification_center/_data_source/notification_center_data_source_test.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {TestBed} from '@angular/core/testing'; - import {HttpErrorResponse} from '../../webapp_data_source/tb_http_client'; import { HttpTestingController, diff --git a/tensorboard/webapp/notification_center/_data_source/testing.ts b/tensorboard/webapp/notification_center/_data_source/testing.ts index 85157caafd..a97bf047a8 100644 --- a/tensorboard/webapp/notification_center/_data_source/testing.ts +++ b/tensorboard/webapp/notification_center/_data_source/testing.ts @@ -14,11 +14,10 @@ limitations under the License. ==============================================================================*/ import {Injectable} from '@angular/core'; import {of} from 'rxjs'; - import { + BackendNotification, NotificationCenterDataSource, NotificationCenterResponse, - BackendNotification, } from './backend_types'; @Injectable() diff --git a/tensorboard/webapp/notification_center/_notification_center_module.ts b/tensorboard/webapp/notification_center/_notification_center_module.ts index 3034eee5de..1ebd5833ca 100644 --- a/tensorboard/webapp/notification_center/_notification_center_module.ts +++ b/tensorboard/webapp/notification_center/_notification_center_module.ts @@ -15,7 +15,6 @@ limitations under the License. import {NgModule} from '@angular/core'; import {EffectsModule} from '@ngrx/effects'; import {createSelector, StoreModule} from '@ngrx/store'; - import { PersistableSettings, PersistentSettingsConfigModule, diff --git a/tensorboard/webapp/notification_center/_redux/notification_center_actions.ts b/tensorboard/webapp/notification_center/_redux/notification_center_actions.ts index 5965789da2..7ffa9c51e9 100644 --- a/tensorboard/webapp/notification_center/_redux/notification_center_actions.ts +++ b/tensorboard/webapp/notification_center/_redux/notification_center_actions.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {createAction, props} from '@ngrx/store'; - import {Notification} from './notification_center_types'; /** diff --git a/tensorboard/webapp/notification_center/_redux/notification_center_effects.ts b/tensorboard/webapp/notification_center/_redux/notification_center_effects.ts index 59d8d6b761..7d545ab060 100644 --- a/tensorboard/webapp/notification_center/_redux/notification_center_effects.ts +++ b/tensorboard/webapp/notification_center/_redux/notification_center_effects.ts @@ -17,7 +17,6 @@ import {Actions, createEffect, ofType, OnInitEffects} from '@ngrx/effects'; import {Action, createAction, Store} from '@ngrx/store'; import {EMPTY, Observable} from 'rxjs'; import {catchError, map, mergeMap} from 'rxjs/operators'; - import {State} from '../../app_state'; import {NotificationCenterDataSource} from '../_data_source/index'; import * as actions from './notification_center_actions'; diff --git a/tensorboard/webapp/notification_center/_redux/notification_center_effects_test.ts b/tensorboard/webapp/notification_center/_redux/notification_center_effects_test.ts index b147f54211..b6e853c7d3 100644 --- a/tensorboard/webapp/notification_center/_redux/notification_center_effects_test.ts +++ b/tensorboard/webapp/notification_center/_redux/notification_center_effects_test.ts @@ -16,7 +16,7 @@ import {TestBed} from '@angular/core/testing'; import {provideMockActions} from '@ngrx/effects/testing'; import {Action, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; -import {of, Subject, throwError} from 'rxjs'; +import {Subject, throwError} from 'rxjs'; import {State} from '../../app_state'; import {TBHttpClientTestingModule} from '../../webapp_data_source/tb_http_client_testing'; import { diff --git a/tensorboard/webapp/notification_center/_redux/notification_center_reducers.ts b/tensorboard/webapp/notification_center/_redux/notification_center_reducers.ts index 98ef7130f6..01ced3d6fb 100644 --- a/tensorboard/webapp/notification_center/_redux/notification_center_reducers.ts +++ b/tensorboard/webapp/notification_center/_redux/notification_center_reducers.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Action, createReducer, on} from '@ngrx/store'; - import {globalSettingsLoaded} from '../../persistent_settings'; import * as actions from './notification_center_actions'; import {Notification, NotificationState} from './notification_center_types'; diff --git a/tensorboard/webapp/notification_center/_redux/testing.ts b/tensorboard/webapp/notification_center/_redux/testing.ts index f27d88c7ae..ffe609e9ed 100644 --- a/tensorboard/webapp/notification_center/_redux/testing.ts +++ b/tensorboard/webapp/notification_center/_redux/testing.ts @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import { + CategoryEnum, Notification, NotificationState, NOTIFICATION_FEATURE_KEY, State, - CategoryEnum, } from './notification_center_types'; export function buildNotification( diff --git a/tensorboard/webapp/notification_center/_views/views_module.ts b/tensorboard/webapp/notification_center/_views/views_module.ts index bc2ec696a8..c5951e8671 100644 --- a/tensorboard/webapp/notification_center/_views/views_module.ts +++ b/tensorboard/webapp/notification_center/_views/views_module.ts @@ -17,7 +17,6 @@ import {NgModule} from '@angular/core'; import {MatButtonModule} from '@angular/material/button'; import {MatIconModule} from '@angular/material/icon'; import {MatMenuModule} from '@angular/material/menu'; - import {MarkdownRendererModule} from '../../widgets/markdown_renderer/markdown_renderer_module'; import {NotificationCenterComponent} from './notification_center_component'; import {NotificationCenterContainer} from './notification_center_container'; diff --git a/tensorboard/webapp/oss_plugins_module.ts b/tensorboard/webapp/oss_plugins_module.ts index 4c781b3dce..f993c24d2e 100644 --- a/tensorboard/webapp/oss_plugins_module.ts +++ b/tensorboard/webapp/oss_plugins_module.ts @@ -18,7 +18,6 @@ limitations under the License. */ import {NgModule} from '@angular/core'; - import {DebuggerModule} from '../plugins/debugger_v2/tf_debugger_v2_plugin/debugger_module'; import {MetricsModule} from './metrics/metrics_module'; import {NpmiModule} from './plugins/npmi/npmi_module'; diff --git a/tensorboard/webapp/persistent_settings/_data_source/persistent_settings_data_source.ts b/tensorboard/webapp/persistent_settings/_data_source/persistent_settings_data_source.ts index c02bacec70..f1e5c1aadb 100644 --- a/tensorboard/webapp/persistent_settings/_data_source/persistent_settings_data_source.ts +++ b/tensorboard/webapp/persistent_settings/_data_source/persistent_settings_data_source.ts @@ -15,7 +15,6 @@ limitations under the License. import {Injectable} from '@angular/core'; import {EMPTY, Observable, of} from 'rxjs'; import {map, tap} from 'rxjs/operators'; - import {LocalStorage} from '../../util/local_storage'; import {BackendSettings, PersistableSettings, ThemeValue} from './types'; diff --git a/tensorboard/webapp/persistent_settings/_data_source/persistent_settings_data_source_module.ts b/tensorboard/webapp/persistent_settings/_data_source/persistent_settings_data_source_module.ts index 405bb56938..04107217a3 100644 --- a/tensorboard/webapp/persistent_settings/_data_source/persistent_settings_data_source_module.ts +++ b/tensorboard/webapp/persistent_settings/_data_source/persistent_settings_data_source_module.ts @@ -13,13 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - import {LocalStorageModule} from '../../util/local_storage'; import { + OSSSettingsConverter, PersistentSettingsDataSource, PersistentSettingsDataSourceImpl, SettingsConverter, - OSSSettingsConverter, } from './persistent_settings_data_source'; @NgModule({ diff --git a/tensorboard/webapp/persistent_settings/_data_source/persistent_settings_data_source_test.ts b/tensorboard/webapp/persistent_settings/_data_source/persistent_settings_data_source_test.ts index be0c642821..8e39bd72b8 100644 --- a/tensorboard/webapp/persistent_settings/_data_source/persistent_settings_data_source_test.ts +++ b/tensorboard/webapp/persistent_settings/_data_source/persistent_settings_data_source_test.ts @@ -15,7 +15,6 @@ limitations under the License. import {Injectable} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {firstValueFrom} from 'rxjs'; - import { LocalStorageTestingModule, TestingLocalStorage, diff --git a/tensorboard/webapp/persistent_settings/_data_source/testing.ts b/tensorboard/webapp/persistent_settings/_data_source/testing.ts index 0078010aed..c4d96aa62e 100644 --- a/tensorboard/webapp/persistent_settings/_data_source/testing.ts +++ b/tensorboard/webapp/persistent_settings/_data_source/testing.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {Injectable, NgModule} from '@angular/core'; import {EMPTY, Observable, of} from 'rxjs'; - import { PersistentSettingsDataSource, PersistentSettingsDataSourceImpl, diff --git a/tensorboard/webapp/persistent_settings/_redux/persistent_settings_actions.ts b/tensorboard/webapp/persistent_settings/_redux/persistent_settings_actions.ts index cb731b6a4f..a9fbbf78f9 100644 --- a/tensorboard/webapp/persistent_settings/_redux/persistent_settings_actions.ts +++ b/tensorboard/webapp/persistent_settings/_redux/persistent_settings_actions.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {createAction, props} from '@ngrx/store'; - import {PersistableSettings} from '../_data_source/types'; /** diff --git a/tensorboard/webapp/persistent_settings/_redux/persistent_settings_effects.ts b/tensorboard/webapp/persistent_settings/_redux/persistent_settings_effects.ts index 312ad5e388..9b89c077e0 100644 --- a/tensorboard/webapp/persistent_settings/_redux/persistent_settings_effects.ts +++ b/tensorboard/webapp/persistent_settings/_redux/persistent_settings_effects.ts @@ -26,11 +26,10 @@ import { skip, tap, } from 'rxjs/operators'; - import {PersistentSettingsConfigModule} from '../persistent_settings_config_module'; import {PersistentSettingsDataSource} from '../_data_source/persistent_settings_data_source'; -import {globalSettingsLoaded} from './persistent_settings_actions'; import {PersistableSettings} from '../_data_source/types'; +import {globalSettingsLoaded} from './persistent_settings_actions'; const initAction = createAction('[Persistent Settings] Effects Init'); const DEBOUNCE_PERIOD_IN_MS = 500; diff --git a/tensorboard/webapp/persistent_settings/_redux/persistent_settings_effects_test.ts b/tensorboard/webapp/persistent_settings/_redux/persistent_settings_effects_test.ts index efd666a6c3..ec77420cf4 100644 --- a/tensorboard/webapp/persistent_settings/_redux/persistent_settings_effects_test.ts +++ b/tensorboard/webapp/persistent_settings/_redux/persistent_settings_effects_test.ts @@ -22,7 +22,6 @@ import {provideMockActions} from '@ngrx/effects/testing'; import {Action, createSelector, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {EMPTY, of, ReplaySubject} from 'rxjs'; - import {PersistentSettingsConfigModule} from '../persistent_settings_config_module'; import { PersistentSettingsTestingDataSource, diff --git a/tensorboard/webapp/persistent_settings/index.ts b/tensorboard/webapp/persistent_settings/index.ts index 6e3d05c8a3..afb7c0d3a8 100644 --- a/tensorboard/webapp/persistent_settings/index.ts +++ b/tensorboard/webapp/persistent_settings/index.ts @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +export {PersistentSettingsConfigModule} from './persistent_settings_config_module'; +export {PersistentSettingsModule} from './persistent_settings_module'; export {PersistableSettings, ThemeValue} from './_data_source/types'; export {globalSettingsLoaded} from './_redux/persistent_settings_actions'; -export {PersistentSettingsModule} from './persistent_settings_module'; -export {PersistentSettingsConfigModule} from './persistent_settings_config_module'; diff --git a/tensorboard/webapp/persistent_settings/persistent_settings_config_module.ts b/tensorboard/webapp/persistent_settings/persistent_settings_config_module.ts index d53bb573ff..df2619ad48 100644 --- a/tensorboard/webapp/persistent_settings/persistent_settings_config_module.ts +++ b/tensorboard/webapp/persistent_settings/persistent_settings_config_module.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Inject, ModuleWithProviders, NgModule, Optional} from '@angular/core'; - import { GLOBAL_PERSISTENT_SETTINGS_TOKEN, SettingSelector, diff --git a/tensorboard/webapp/persistent_settings/persistent_settings_config_module_test.ts b/tensorboard/webapp/persistent_settings/persistent_settings_config_module_test.ts index e4404be7fd..f1daf9b0f6 100644 --- a/tensorboard/webapp/persistent_settings/persistent_settings_config_module_test.ts +++ b/tensorboard/webapp/persistent_settings/persistent_settings_config_module_test.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {TestBed} from '@angular/core/testing'; import {createSelector, Selector} from '@ngrx/store'; - import {PersistentSettingsConfigModule} from './persistent_settings_config_module'; import {PersistableSettings} from './_data_source/types'; diff --git a/tensorboard/webapp/persistent_settings/persistent_settings_config_types.ts b/tensorboard/webapp/persistent_settings/persistent_settings_config_types.ts index 6e1a8e17dc..8b2bb02fa6 100644 --- a/tensorboard/webapp/persistent_settings/persistent_settings_config_types.ts +++ b/tensorboard/webapp/persistent_settings/persistent_settings_config_types.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {InjectionToken} from '@angular/core'; import {Selector} from '@ngrx/store'; - import {PersistableSettings} from './_data_source/types'; export type SettingSelector< diff --git a/tensorboard/webapp/persistent_settings/persistent_settings_module.ts b/tensorboard/webapp/persistent_settings/persistent_settings_module.ts index 19b313dceb..2c5d8b8bee 100644 --- a/tensorboard/webapp/persistent_settings/persistent_settings_module.ts +++ b/tensorboard/webapp/persistent_settings/persistent_settings_module.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; import {EffectsModule} from '@ngrx/effects'; - import {PersistentSettingsConfigModule} from './persistent_settings_config_module'; import {PersistentSettingsDataSourceModule} from './_data_source/persistent_settings_data_source_module'; import {PersistentSettingsEffects} from './_redux/persistent_settings_effects'; diff --git a/tensorboard/webapp/plugins/npmi/actions/npmi_actions.ts b/tensorboard/webapp/plugins/npmi/actions/npmi_actions.ts index 477bcd1ffc..4e0f1669b7 100644 --- a/tensorboard/webapp/plugins/npmi/actions/npmi_actions.ts +++ b/tensorboard/webapp/plugins/npmi/actions/npmi_actions.ts @@ -15,8 +15,8 @@ limitations under the License. import {createAction, props} from '@ngrx/store'; import { AnnotationDataListing, - MetricListing, EmbeddingDataSet, + MetricListing, } from '../store/npmi_types'; /** diff --git a/tensorboard/webapp/plugins/npmi/data_source/npmi_data_source.ts b/tensorboard/webapp/plugins/npmi/data_source/npmi_data_source.ts index 9c15dcb8e0..9d430d92b0 100644 --- a/tensorboard/webapp/plugins/npmi/data_source/npmi_data_source.ts +++ b/tensorboard/webapp/plugins/npmi/data_source/npmi_data_source.ts @@ -13,22 +13,20 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Injectable} from '@angular/core'; - -import {Observable, of, forkJoin, throwError} from 'rxjs'; -import {map, catchError} from 'rxjs/operators'; - +import {forkJoin, Observable, of, throwError} from 'rxjs'; +import {catchError, map} from 'rxjs/operators'; import { - TBHttpClient, HttpErrorResponse, + TBHttpClient, } from '../../../webapp_data_source/tb_http_client'; import * as metric_type from '../util/metric_type'; +import {buildEmbeddingDataSet, EmbeddingDataSet} from '../util/umap'; import { - MetricListing, AnnotationDataListing, - ValueData, EmbeddingListing, + MetricListing, + ValueData, } from './../store/npmi_types'; -import {EmbeddingDataSet, buildEmbeddingDataSet} from '../util/umap'; export abstract class NpmiDataSource { abstract fetchData(experimentIds: string[]): Observable<{ diff --git a/tensorboard/webapp/plugins/npmi/data_source/npmi_data_source_module.ts b/tensorboard/webapp/plugins/npmi/data_source/npmi_data_source_module.ts index 5307f107a1..f597ce11eb 100644 --- a/tensorboard/webapp/plugins/npmi/data_source/npmi_data_source_module.ts +++ b/tensorboard/webapp/plugins/npmi/data_source/npmi_data_source_module.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; -import {NpmiHttpServerDataSource} from './npmi_data_source'; import {TBHttpClientModule} from '../../../webapp_data_source/tb_http_client_module'; +import {NpmiHttpServerDataSource} from './npmi_data_source'; @NgModule({ imports: [TBHttpClientModule], diff --git a/tensorboard/webapp/plugins/npmi/data_source/npmi_data_source_test.ts b/tensorboard/webapp/plugins/npmi/data_source/npmi_data_source_test.ts index 0e710b8d22..69d7bc401e 100644 --- a/tensorboard/webapp/plugins/npmi/data_source/npmi_data_source_test.ts +++ b/tensorboard/webapp/plugins/npmi/data_source/npmi_data_source_test.ts @@ -17,9 +17,8 @@ import { HttpTestingController, TBHttpClientTestingModule, } from '../../../webapp_data_source/tb_http_client_testing'; - -import {NpmiHttpServerDataSource} from './npmi_data_source'; import {createSampleEmbeddingData} from '../testing'; +import {NpmiHttpServerDataSource} from './npmi_data_source'; describe('runs_data_source', () => { let httpMock: HttpTestingController; diff --git a/tensorboard/webapp/plugins/npmi/effects/npmi_effects.ts b/tensorboard/webapp/plugins/npmi/effects/npmi_effects.ts index cd638f2ecb..28a3846814 100644 --- a/tensorboard/webapp/plugins/npmi/effects/npmi_effects.ts +++ b/tensorboard/webapp/plugins/npmi/effects/npmi_effects.ts @@ -13,30 +13,28 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Injectable} from '@angular/core'; -import {Store} from '@ngrx/store'; import {Actions, createEffect, ofType} from '@ngrx/effects'; - -import {merge, Observable, EMPTY} from 'rxjs'; +import {Store} from '@ngrx/store'; +import {EMPTY, merge, Observable} from 'rxjs'; import { + catchError, filter, map, mergeMap, tap, withLatestFrom, - catchError, } from 'rxjs/operators'; - -import {NpmiHttpServerDataSource} from '../data_source/npmi_data_source'; -import {DataLoadState} from './../store/npmi_types'; import {State} from '../../../app_state'; -import {getPluginDataLoaded} from './../store/npmi_selectors'; +import * as selectors from '../../../selectors'; +import {NpmiHttpServerDataSource} from '../data_source/npmi_data_source'; import { npmiLoaded, - npmiPluginDataRequested, npmiPluginDataLoaded, + npmiPluginDataRequested, npmiPluginDataRequestFailed, } from './../actions'; -import * as selectors from '../../../selectors'; +import {getPluginDataLoaded} from './../store/npmi_selectors'; +import {DataLoadState} from './../store/npmi_types'; @Injectable() export class NpmiEffects { diff --git a/tensorboard/webapp/plugins/npmi/effects/npmi_effects_test.ts b/tensorboard/webapp/plugins/npmi/effects/npmi_effects_test.ts index 1ec4d9dc77..7f98e2fbb2 100644 --- a/tensorboard/webapp/plugins/npmi/effects/npmi_effects_test.ts +++ b/tensorboard/webapp/plugins/npmi/effects/npmi_effects_test.ts @@ -16,22 +16,21 @@ import {TestBed} from '@angular/core/testing'; import {provideMockActions} from '@ngrx/effects/testing'; import {Action, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; -import {TBHttpClientTestingModule} from '../../../webapp_data_source/tb_http_client_testing'; import {Subject} from 'rxjs'; - -import {NpmiHttpServerDataSource} from '../data_source/npmi_data_source'; import {NpmiEffects} from '.'; -import {createSampleEmbeddingData, createNpmiState} from '../testing'; import {State} from '../../../app_state'; +import * as selectors from '../../../selectors'; +import {TBHttpClientTestingModule} from '../../../webapp_data_source/tb_http_client_testing'; +import * as actions from '../actions'; +import {NpmiHttpServerDataSource} from '../data_source/npmi_data_source'; +import {getPluginDataLoaded} from '../store/npmi_selectors'; import { - DataLoadState, AnnotationDataListing, - MetricListing, + DataLoadState, EmbeddingDataSet, + MetricListing, } from '../store/npmi_types'; -import {getPluginDataLoaded} from '../store/npmi_selectors'; -import * as actions from '../actions'; -import * as selectors from '../../../selectors'; +import {createNpmiState, createSampleEmbeddingData} from '../testing'; describe('npmi effects', () => { let dataSource: NpmiHttpServerDataSource; diff --git a/tensorboard/webapp/plugins/npmi/npmi_container.ts b/tensorboard/webapp/plugins/npmi/npmi_container.ts index 1d9ea6def2..270913a1ed 100644 --- a/tensorboard/webapp/plugins/npmi/npmi_container.ts +++ b/tensorboard/webapp/plugins/npmi/npmi_container.ts @@ -14,11 +14,10 @@ limitations under the License. ==============================================================================*/ import {Component, OnInit} from '@angular/core'; import {select, Store} from '@ngrx/store'; - -import {npmiLoaded} from './actions'; import {State} from '../../app_state'; -import {getViewActive} from './store/npmi_selectors'; import {getCurrentRouteRunSelection} from '../../selectors'; +import {npmiLoaded} from './actions'; +import {getViewActive} from './store/npmi_selectors'; @Component({ selector: 'npmi', diff --git a/tensorboard/webapp/plugins/npmi/npmi_container_test.ts b/tensorboard/webapp/plugins/npmi/npmi_container_test.ts index d622f67576..e3ebea4486 100644 --- a/tensorboard/webapp/plugins/npmi/npmi_container_test.ts +++ b/tensorboard/webapp/plugins/npmi/npmi_container_test.ts @@ -18,18 +18,16 @@ limitations under the License. import {NO_ERRORS_SCHEMA} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../app_state'; +import {createCoreState, createState} from '../../core/testing'; import {getCurrentRouteRunSelection} from './../../selectors'; -import {getViewActive} from './store'; -import {appStateFromNpmiState, createNpmiState} from './testing'; -import {createState, createCoreState} from '../../core/testing'; import {NpmiComponent} from './npmi_component'; import {NpmiContainer} from './npmi_container'; +import {getViewActive} from './store'; import {ViewActive} from './store/npmi_types'; +import {appStateFromNpmiState, createNpmiState} from './testing'; describe('Npmi Container', () => { let store: MockStore; diff --git a/tensorboard/webapp/plugins/npmi/npmi_module.ts b/tensorboard/webapp/plugins/npmi/npmi_module.ts index 0d256df5c9..4e4369dfb0 100644 --- a/tensorboard/webapp/plugins/npmi/npmi_module.ts +++ b/tensorboard/webapp/plugins/npmi/npmi_module.ts @@ -14,22 +14,18 @@ limitations under the License. ==============================================================================*/ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; -import {StoreModule} from '@ngrx/store'; import {EffectsModule} from '@ngrx/effects'; - -import {NpmiComponent} from './npmi_component'; -import {NpmiContainer} from './npmi_container'; - +import {StoreModule} from '@ngrx/store'; +import {PluginRegistryModule} from '../../plugins/plugin_registry_module'; import {NpmiServerDataSourceModule} from './data_source/npmi_data_source_module'; import {NpmiEffects} from './effects'; +import {NpmiComponent} from './npmi_component'; +import {NpmiContainer} from './npmi_container'; import {reducers} from './store/npmi_reducers'; import {NPMI_FEATURE_KEY} from './store/npmi_types'; - +import {EmbeddingsModule} from './views/embeddings/embeddings_module'; import {InactiveModule} from './views/inactive/inactive_module'; import {MainModule} from './views/main/main_module'; -import {EmbeddingsModule} from './views/embeddings/embeddings_module'; - -import {PluginRegistryModule} from '../../plugins/plugin_registry_module'; @NgModule({ declarations: [NpmiComponent, NpmiContainer], diff --git a/tensorboard/webapp/plugins/npmi/store/index.ts b/tensorboard/webapp/plugins/npmi/store/index.ts index 4f6cbd0b17..d8b803f91e 100644 --- a/tensorboard/webapp/plugins/npmi/store/index.ts +++ b/tensorboard/webapp/plugins/npmi/store/index.ts @@ -15,4 +15,4 @@ limitations under the License. export * from './npmi_reducers'; export * from './npmi_selectors'; -export {NPMI_FEATURE_KEY, NpmiState, State} from './npmi_types'; +export {NpmiState, NPMI_FEATURE_KEY, State} from './npmi_types'; diff --git a/tensorboard/webapp/plugins/npmi/store/npmi_reducers.ts b/tensorboard/webapp/plugins/npmi/store/npmi_reducers.ts index c7c331579b..af2f82b44d 100644 --- a/tensorboard/webapp/plugins/npmi/store/npmi_reducers.ts +++ b/tensorboard/webapp/plugins/npmi/store/npmi_reducers.ts @@ -13,20 +13,18 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Action, createReducer, on} from '@ngrx/store'; - import * as actions from '../actions'; +import * as metricType from '../util/metric_type'; import { - NpmiState, + ArithmeticElement, + ArithmeticKind, DataLoadState, MetricListing, - SortOrder, - ArithmeticElement, + NpmiState, Operator, - ArithmeticKind, + SortOrder, ViewActive, } from './npmi_types'; -import * as metricType from '../util/metric_type'; -import {buildEmbeddingDataSet} from '../util/umap'; const initialState: NpmiState = { pluginDataLoaded: { diff --git a/tensorboard/webapp/plugins/npmi/store/npmi_reducers_test.ts b/tensorboard/webapp/plugins/npmi/store/npmi_reducers_test.ts index 7c03027396..6b967692d2 100644 --- a/tensorboard/webapp/plugins/npmi/store/npmi_reducers_test.ts +++ b/tensorboard/webapp/plugins/npmi/store/npmi_reducers_test.ts @@ -13,15 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as actions from '../actions'; +import {createNpmiState, createSampleEmbeddingData} from '../testing'; import {reducers} from './npmi_reducers'; import { + ArithmeticKind, DataLoadState, Operator, SortOrder, - ArithmeticKind, ViewActive, } from './npmi_types'; -import {createSampleEmbeddingData, createNpmiState} from '../testing'; describe('npmi_reducers', () => { describe('Data loading', () => { diff --git a/tensorboard/webapp/plugins/npmi/store/npmi_selectors.ts b/tensorboard/webapp/plugins/npmi/store/npmi_selectors.ts index 30addf9f51..44d0e74587 100644 --- a/tensorboard/webapp/plugins/npmi/store/npmi_selectors.ts +++ b/tensorboard/webapp/plugins/npmi/store/npmi_selectors.ts @@ -12,19 +12,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {createSelector, createFeatureSelector} from '@ngrx/store'; +import {createFeatureSelector, createSelector} from '@ngrx/store'; import { - NPMI_FEATURE_KEY, - NpmiState, - DataLoadState, AnnotationDataListing, - MetricListing, - State, + AnnotationSort, ArithmeticElement, + DataLoadState, + EmbeddingDataSet, MetricFilterListing, - AnnotationSort, + MetricListing, + NpmiState, + NPMI_FEATURE_KEY, + State, ViewActive, - EmbeddingDataSet, } from './npmi_types'; const selectNpmiState = createFeatureSelector( diff --git a/tensorboard/webapp/plugins/npmi/store/npmi_selectors_test.ts b/tensorboard/webapp/plugins/npmi/store/npmi_selectors_test.ts index df221d3e1f..82239bd85e 100644 --- a/tensorboard/webapp/plugins/npmi/store/npmi_selectors_test.ts +++ b/tensorboard/webapp/plugins/npmi/store/npmi_selectors_test.ts @@ -13,41 +13,41 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import { - getPluginDataLoaded, + createNpmiState, + createSampleEmbeddingData, + createState, +} from '../testing'; +import { getAnnotationData, - getRunToMetrics, + getAnnotationsExpanded, + getAnnotationSort, + getAnnotationsRegex, getEmbeddingDataSet, - getSelectedAnnotations, + getEmbeddingsMetric, + getEmbeddingsSidebarExpanded, + getEmbeddingsSidebarWidth, getFlaggedAnnotations, getHiddenAnnotations, - getAnnotationsRegex, - getMetricsRegex, getMetricArithmetic, getMetricFilters, - getAnnotationSort, + getMetricsRegex, getPCExpanded, - getAnnotationsExpanded, + getPluginDataLoaded, + getRunToMetrics, + getSelectedAnnotations, getShowCounts, getShowHiddenAnnotations, - getSidebarWidth, getSidebarExpanded, + getSidebarWidth, getViewActive, - getEmbeddingsMetric, - getEmbeddingsSidebarWidth, - getEmbeddingsSidebarExpanded, } from './npmi_selectors'; import { + ArithmeticKind, DataLoadState, Operator, SortOrder, - ArithmeticKind, ViewActive, } from './npmi_types'; -import { - createSampleEmbeddingData, - createNpmiState, - createState, -} from '../testing'; describe('npmi selectors', () => { describe('getPluginDataLoadState', () => { diff --git a/tensorboard/webapp/plugins/npmi/store/npmi_types.ts b/tensorboard/webapp/plugins/npmi/store/npmi_types.ts index dc39cb11f5..8fa71ef714 100644 --- a/tensorboard/webapp/plugins/npmi/store/npmi_types.ts +++ b/tensorboard/webapp/plugins/npmi/store/npmi_types.ts @@ -14,8 +14,8 @@ limitations under the License. ==============================================================================*/ import {DataLoadState, LoadState} from '../../../types/data'; import { - EmbeddingDataSet, EmbeddingDataPoint, + EmbeddingDataSet, EmbeddingListing, } from '../util/umap'; diff --git a/tensorboard/webapp/plugins/npmi/testing/index.ts b/tensorboard/webapp/plugins/npmi/testing/index.ts index b86a35a6b3..f51b8c4f31 100644 --- a/tensorboard/webapp/plugins/npmi/testing/index.ts +++ b/tensorboard/webapp/plugins/npmi/testing/index.ts @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import { - NpmiState, DataLoadState, + NpmiState, NPMI_FEATURE_KEY, - State, SortOrder, + State, ViewActive, } from '../store/npmi_types'; import {buildEmbeddingDataSet} from '../util/umap'; diff --git a/tensorboard/webapp/plugins/npmi/util/coordinate_data.ts b/tensorboard/webapp/plugins/npmi/util/coordinate_data.ts index 1e28ea230b..1b4c5c6bc5 100644 --- a/tensorboard/webapp/plugins/npmi/util/coordinate_data.ts +++ b/tensorboard/webapp/plugins/npmi/util/coordinate_data.ts @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {ValueData, AnnotationDataListing} from '../store/npmi_types'; +import {AnnotationDataListing, ValueData} from '../store/npmi_types'; export type Coordinate = { runId: string; diff --git a/tensorboard/webapp/plugins/npmi/util/coordinate_data_test.ts b/tensorboard/webapp/plugins/npmi/util/coordinate_data_test.ts index 68b7afc96d..08b1d7dbd5 100644 --- a/tensorboard/webapp/plugins/npmi/util/coordinate_data_test.ts +++ b/tensorboard/webapp/plugins/npmi/util/coordinate_data_test.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {AnnotationDataListing} from '../store/npmi_types'; -import {convertToCoordinateData} from './coordinate_data'; import {buildSampleAnnotationData} from '../testing'; +import {convertToCoordinateData} from './coordinate_data'; describe('coordinate data utils', () => { it('creates coordinate data', () => { diff --git a/tensorboard/webapp/plugins/npmi/util/filter_annotations.ts b/tensorboard/webapp/plugins/npmi/util/filter_annotations.ts index d5bd532fdd..63f75289df 100644 --- a/tensorboard/webapp/plugins/npmi/util/filter_annotations.ts +++ b/tensorboard/webapp/plugins/npmi/util/filter_annotations.ts @@ -15,8 +15,8 @@ limitations under the License. import { AnnotationDataListing, ArithmeticElement, - MetricFilterListing, ArithmeticKind, + MetricFilterListing, ValueData, } from './../store/npmi_types'; import {stripMetricString} from './metric_type'; diff --git a/tensorboard/webapp/plugins/npmi/util/filter_annotations_test.ts b/tensorboard/webapp/plugins/npmi/util/filter_annotations_test.ts index 4fb77d4ffb..a2db72f7da 100644 --- a/tensorboard/webapp/plugins/npmi/util/filter_annotations_test.ts +++ b/tensorboard/webapp/plugins/npmi/util/filter_annotations_test.ts @@ -16,11 +16,11 @@ import { AnnotationDataListing, ArithmeticElement, ArithmeticKind, - Operator, MetricFilterListing, + Operator, } from '../store/npmi_types'; -import {filterAnnotations, removeHiddenAnnotations} from './filter_annotations'; import {buildSampleAnnotationData} from '../testing'; +import {filterAnnotations, removeHiddenAnnotations} from './filter_annotations'; describe('filter annotations utils', () => { const annotationData: AnnotationDataListing = buildSampleAnnotationData(); diff --git a/tensorboard/webapp/plugins/npmi/util/sort_annotations_test.ts b/tensorboard/webapp/plugins/npmi/util/sort_annotations_test.ts index 3b83b2ccb1..97d53b1734 100644 --- a/tensorboard/webapp/plugins/npmi/util/sort_annotations_test.ts +++ b/tensorboard/webapp/plugins/npmi/util/sort_annotations_test.ts @@ -14,12 +14,12 @@ limitations under the License. ==============================================================================*/ import { AnnotationDataListing, - SortOrder, AnnotationSort, + SortOrder, } from '../store/npmi_types'; -import {buildEmbeddingDataSet} from './umap'; -import {sortAnnotations} from './sort_annotations'; import {buildSampleAnnotationData, createSampleEmbeddingData} from '../testing'; +import {sortAnnotations} from './sort_annotations'; +import {buildEmbeddingDataSet} from './umap'; describe('sort annotations utils', () => { it('sorts annotations upwards', () => { diff --git a/tensorboard/webapp/plugins/npmi/util/umap_test.ts b/tensorboard/webapp/plugins/npmi/util/umap_test.ts index 8cc272917d..fdd79c3691 100644 --- a/tensorboard/webapp/plugins/npmi/util/umap_test.ts +++ b/tensorboard/webapp/plugins/npmi/util/umap_test.ts @@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {buildEmbeddingDataSet, projectUmap} from './umap'; import {createSampleEmbeddingListing} from '../testing'; +import {buildEmbeddingDataSet, projectUmap} from './umap'; describe('umap utils', () => { it('builds embedding dataset', () => { diff --git a/tensorboard/webapp/plugins/npmi/util/violin_data.ts b/tensorboard/webapp/plugins/npmi/util/violin_data.ts index 02bc5b9178..a6a7f8a610 100644 --- a/tensorboard/webapp/plugins/npmi/util/violin_data.ts +++ b/tensorboard/webapp/plugins/npmi/util/violin_data.ts @@ -12,11 +12,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +import * as d3 from '../../../third_party/d3'; import {AnnotationDataListing} from './../store/npmi_types'; import {stripMetricString} from './metric_type'; -import * as d3 from '../../../third_party/d3'; - export type ViolinChartData = {[runId: string]: ViolinBin[]}; export type ViolinBin = d3.Bin; diff --git a/tensorboard/webapp/plugins/npmi/util/violin_data_test.ts b/tensorboard/webapp/plugins/npmi/util/violin_data_test.ts index 1e0282750c..9a0e6e0627 100644 --- a/tensorboard/webapp/plugins/npmi/util/violin_data_test.ts +++ b/tensorboard/webapp/plugins/npmi/util/violin_data_test.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {AnnotationDataListing} from '../store/npmi_types'; -import {violinData} from './violin_data'; import {buildSampleAnnotationData} from '../testing'; +import {violinData} from './violin_data'; class TestableBin extends Array { x0: number; diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotation/annotation_component.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotation/annotation_component.ts index 781e9f4853..44ce6025c0 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotation/annotation_component.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotation/annotation_component.ts @@ -13,25 +13,25 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import { + AfterViewInit, ChangeDetectionStrategy, Component, - Input, - Output, + ElementRef, EventEmitter, - AfterViewInit, + HostBinding, + HostListener, + Input, OnChanges, + Output, SimpleChanges, ViewChild, - ElementRef, ViewEncapsulation, - HostBinding, - HostListener, } from '@angular/core'; -import {ValueData, SortOrder, AnnotationSort} from '../../../store/npmi_types'; +import {Run} from '../../../../../runs/store/runs_types'; import * as d3 from '../../../../../third_party/d3'; -import {stripMetricString} from '../../../util/metric_type'; import {RunColorScale} from '../../../../../types/ui'; -import {Run} from '../../../../../runs/store/runs_types'; +import {AnnotationSort, SortOrder, ValueData} from '../../../store/npmi_types'; +import {stripMetricString} from '../../../util/metric_type'; @Component({ selector: 'annotation-component', diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotation/annotation_container.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotation/annotation_container.ts index 2055e17570..932d6620b1 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotation/annotation_container.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotation/annotation_container.ts @@ -12,24 +12,23 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {Component, ChangeDetectionStrategy, Input} from '@angular/core'; +import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; import {Store} from '@ngrx/store'; -import {State} from '../../../../../app_state'; import {Observable} from 'rxjs'; import {map} from 'rxjs/operators'; - +import {State} from '../../../../../app_state'; +import * as selectors from '../../../../../selectors'; +import {RunColorScale} from '../../../../../types/ui'; +import * as npmiActions from '../../../actions'; import { - getSelectedAnnotations, + getAnnotationSort, getFlaggedAnnotations, getHiddenAnnotations, + getSelectedAnnotations, getShowCounts, getSidebarWidth, - getAnnotationSort, } from '../../../store'; -import * as selectors from '../../../../../selectors'; import {ValueData} from '../../../store/npmi_types'; -import * as npmiActions from '../../../actions'; -import {RunColorScale} from '../../../../../types/ui'; @Component({ selector: 'npmi-annotation', diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotation/annotation_module.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotation/annotation_module.ts index d4bd9c48e6..5959d83382 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotation/annotation_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotation/annotation_module.ts @@ -15,11 +15,9 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {FormsModule} from '@angular/forms'; - +import {MatButtonModule} from '@angular/material/button'; import {MatCheckboxModule} from '@angular/material/checkbox'; import {MatIconModule} from '@angular/material/icon'; -import {MatButtonModule} from '@angular/material/button'; - import {AnnotationComponent} from './annotation_component'; import {AnnotationContainer} from './annotation_container'; diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotation/annotation_test.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotation/annotation_test.ts index 0c159559a4..d0eef3ca8b 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotation/annotation_test.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotation/annotation_test.ts @@ -13,28 +13,24 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NO_ERRORS_SCHEMA} from '@angular/core'; -import {TestBed, ComponentFixture} from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; +import {MatCheckboxModule} from '@angular/material/checkbox'; import {By} from '@angular/platform-browser'; - import {Action, Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - -import {MatCheckboxModule} from '@angular/material/checkbox'; - +import {MockStore, provideMockStore} from '@ngrx/store/testing'; +import {getExperimentIdsFromRoute} from '../../../../../app_routing/store/app_routing_selectors'; import {State} from '../../../../../app_state'; -import {appStateFromNpmiState, createNpmiState} from '../../../testing'; -import {AnnotationComponent} from './annotation_component'; -import {AnnotationContainer} from './annotation_container'; +import {buildRun} from '../../../../../runs/store/testing'; +import * as selectors from '../../../../../selectors'; import { - getSelectedAnnotations, getFlaggedAnnotations, getHiddenAnnotations, + getSelectedAnnotations, getShowCounts, } from '../../../store'; -import * as selectors from '../../../../../selectors'; -import {buildRun} from '../../../../../runs/store/testing'; - -import {getExperimentIdsFromRoute} from '../../../../../app_routing/store/app_routing_selectors'; +import {appStateFromNpmiState, createNpmiState} from '../../../testing'; +import {AnnotationComponent} from './annotation_component'; +import {AnnotationContainer} from './annotation_container'; describe('Npmi Annotations List Row', () => { let store: MockStore; diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_component.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_component.ts index 9237460beb..a9ee6075d4 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_component.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_component.ts @@ -15,11 +15,10 @@ limitations under the License. import { ChangeDetectionStrategy, Component, + EventEmitter, Input, Output, - EventEmitter, } from '@angular/core'; - import { AnnotationDataListing, AnnotationSort, diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_container.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_container.ts index 20470e099f..5f3daa3dbd 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_container.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_container.ts @@ -12,33 +12,31 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {Component, ChangeDetectionStrategy} from '@angular/core'; - +import {ChangeDetectionStrategy, Component} from '@angular/core'; import {select, Store} from '@ngrx/store'; -import {map, share} from 'rxjs/operators'; import {combineLatest} from 'rxjs'; - +import {map, share} from 'rxjs/operators'; import {State} from '../../../../app_state'; +import {getCurrentRouteRunSelection} from '../../../../selectors'; +import * as npmiActions from '../../actions'; import { getAnnotationData, - getMetricArithmetic, - getMetricFilters, - getRunToMetrics, - getShowHiddenAnnotations, - getHiddenAnnotations, getAnnotationsExpanded, - getSelectedAnnotations, getAnnotationSort, getAnnotationsRegex, getEmbeddingDataSet, + getHiddenAnnotations, + getMetricArithmetic, + getMetricFilters, + getRunToMetrics, + getSelectedAnnotations, + getShowHiddenAnnotations, } from '../../store'; -import {getCurrentRouteRunSelection} from '../../../../selectors'; import { filterAnnotations, removeHiddenAnnotations, } from '../../util/filter_annotations'; import {metricIsNpmiAndNotDiff} from '../../util/metric_type'; -import * as npmiActions from '../../actions'; import {sortAnnotations} from '../../util/sort_annotations'; @Component({ diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_module.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_module.ts index 651600569b..d3452e8d53 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_module.ts @@ -12,16 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +import {ScrollingModule} from '@angular/cdk/scrolling'; import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; -import {ScrollingModule} from '@angular/cdk/scrolling'; - +import {AnnotationModule} from './annotation/annotation_module'; import {AnnotationsListComponent} from './annotations_list_component'; import {AnnotationsListContainer} from './annotations_list_container'; import {AnnotationsListToolbarModule} from './annotations_list_toolbar/annotations_list_toolbar_module'; import {HeaderModule} from './header/header_module'; import {LegendModule} from './legend/legend_module'; -import {AnnotationModule} from './annotation/annotation_module'; @NgModule({ declarations: [AnnotationsListComponent, AnnotationsListContainer], diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_test.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_test.ts index f7bb904f61..80f0923ddb 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_test.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_test.ts @@ -15,15 +15,13 @@ limitations under the License. import {NO_ERRORS_SCHEMA} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../../app_state'; +import {createCoreState, createState} from '../../../../core/testing'; import * as selectors from '../../../../selectors'; import {getAnnotationsExpanded} from '../../store'; import {appStateFromNpmiState, createNpmiState} from '../../testing'; -import {createState, createCoreState} from '../../../../core/testing'; import {AnnotationsListComponent} from './annotations_list_component'; import {AnnotationsListContainer} from './annotations_list_container'; diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_list_toolbar_component.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_list_toolbar_component.ts index db0cd1b403..e9cbcea8b5 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_list_toolbar_component.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_list_toolbar_component.ts @@ -15,9 +15,9 @@ limitations under the License. import { ChangeDetectionStrategy, Component, + EventEmitter, Input, Output, - EventEmitter, } from '@angular/core'; @Component({ diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_list_toolbar_container.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_list_toolbar_container.ts index cb69d4d411..df4414eb09 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_list_toolbar_container.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_list_toolbar_container.ts @@ -12,17 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {Component, ChangeDetectionStrategy, Input} from '@angular/core'; +import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; import {Store} from '@ngrx/store'; -import {State} from '../../../../../app_state'; import {map} from 'rxjs/operators'; +import {State} from '../../../../../app_state'; import * as npmiActions from '../../../actions'; - import { - getSelectedAnnotations, getAnnotationsExpanded, - getShowCounts, getAnnotationsRegex, + getSelectedAnnotations, + getShowCounts, getShowHiddenAnnotations, } from '../../../store'; diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_list_toolbar_module.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_list_toolbar_module.ts index 9c341c15d6..a89b363753 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_list_toolbar_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_list_toolbar_module.ts @@ -15,11 +15,9 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {FormsModule} from '@angular/forms'; - import {MatButtonModule} from '@angular/material/button'; import {MatIconModule} from '@angular/material/icon'; import {MatSlideToggleModule} from '@angular/material/slide-toggle'; - import {AnnotationsListToolbarComponent} from './annotations_list_toolbar_component'; import {AnnotationsListToolbarContainer} from './annotations_list_toolbar_container'; import {AnnotationsSearchModule} from './annotations_search/annotations_search_module'; diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_list_toolbar_test.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_list_toolbar_test.ts index 9fa2dc68b8..d612367416 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_list_toolbar_test.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_list_toolbar_test.ts @@ -15,16 +15,14 @@ limitations under the License. import {NO_ERRORS_SCHEMA} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - -import {Store, Action} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {Action, Store} from '@ngrx/store'; +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../../../app_state'; -import {AnnotationsListToolbarComponent} from './annotations_list_toolbar_component'; -import {AnnotationsListToolbarContainer} from './annotations_list_toolbar_container'; -import {appStateFromNpmiState, createNpmiState} from '../../../testing'; import * as npmiActions from '../../../actions'; import {getSelectedAnnotations} from '../../../store'; +import {appStateFromNpmiState, createNpmiState} from '../../../testing'; +import {AnnotationsListToolbarComponent} from './annotations_list_toolbar_component'; +import {AnnotationsListToolbarContainer} from './annotations_list_toolbar_container'; describe('Npmi Annotations List Toolbar Container', () => { let store: MockStore; diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_search/annotations_search_component.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_search/annotations_search_component.ts index 2114a1259f..c943003b3a 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_search/annotations_search_component.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_search/annotations_search_component.ts @@ -15,10 +15,10 @@ limitations under the License. import { ChangeDetectionStrategy, Component, - Input, - Output, EventEmitter, HostBinding, + Input, + Output, } from '@angular/core'; @Component({ diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_search/annotations_search_container.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_search/annotations_search_container.ts index 9788e693d2..7fdcff78c7 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_search/annotations_search_container.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_search/annotations_search_container.ts @@ -12,12 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {Component, ChangeDetectionStrategy} from '@angular/core'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; import {Store} from '@ngrx/store'; -import {State} from '../../../../../../app_state'; import {map} from 'rxjs/operators'; +import {State} from '../../../../../../app_state'; import * as npmiActions from '../../../../actions'; - import {getAnnotationsRegex} from '../../../../store'; @Component({ diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_search/annotations_search_module.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_search/annotations_search_module.ts index 83b0fcc4e6..e90f729cd4 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_search/annotations_search_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_search/annotations_search_module.ts @@ -15,10 +15,8 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {FormsModule} from '@angular/forms'; - import {MatIconModule} from '@angular/material/icon'; import {MatInputModule} from '@angular/material/input'; - import {AnnotationsSearchComponent} from './annotations_search_component'; import {AnnotationsSearchContainer} from './annotations_search_container'; diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_search/annotations_search_test.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_search/annotations_search_test.ts index d1f801f623..e5c4237966 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_search/annotations_search_test.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/annotations_list_toolbar/annotations_search/annotations_search_test.ts @@ -15,23 +15,20 @@ limitations under the License. /** * Unit tests for the Annotations Search. */ +import {CommonModule} from '@angular/common'; import {NO_ERRORS_SCHEMA} from '@angular/core'; import {TestBed} from '@angular/core/testing'; -import {By} from '@angular/platform-browser'; import {FormsModule} from '@angular/forms'; -import {CommonModule} from '@angular/common'; - import {MatInputModule} from '@angular/material/input'; - +import {By} from '@angular/platform-browser'; import {Action, Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../../../../app_state'; import * as npmiActions from '../../../../actions'; +import {getAnnotationsRegex} from '../../../../store'; import {appStateFromNpmiState, createNpmiState} from '../../../../testing'; -import {AnnotationsSearchContainer} from './annotations_search_container'; import {AnnotationsSearchComponent} from './annotations_search_component'; -import {getAnnotationsRegex} from '../../../../store'; +import {AnnotationsSearchContainer} from './annotations_search_container'; describe('Npmi Annotations Search Container', () => { let store: MockStore; diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/header/header_component.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/header/header_component.ts index f62e46c856..9ffedb8ab2 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/header/header_component.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/header/header_component.ts @@ -15,12 +15,12 @@ limitations under the License. import { ChangeDetectionStrategy, Component, + EventEmitter, Input, Output, - EventEmitter, } from '@angular/core'; -import {stripMetricString} from '../../../util/metric_type'; import {AnnotationSort, SortOrder} from '../../../store/npmi_types'; +import {stripMetricString} from '../../../util/metric_type'; @Component({ selector: 'npmi-annotations-list-header-component', diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/header/header_container.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/header/header_container.ts index a93f01fd3f..bcf2084b49 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/header/header_container.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/header/header_container.ts @@ -12,13 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {Component, ChangeDetectionStrategy, Input} from '@angular/core'; +import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; import {Store} from '@ngrx/store'; import {State} from '../../../../../app_state'; - -import {getSelectedAnnotations, getAnnotationSort} from '../../../store'; -import {AnnotationDataListing} from './../../../store/npmi_types'; import * as npmiActions from '../../../actions'; +import {getAnnotationSort, getSelectedAnnotations} from '../../../store'; +import {AnnotationDataListing} from './../../../store/npmi_types'; @Component({ selector: 'npmi-annotations-list-header', diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/header/header_module.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/header/header_module.ts index 4c0d2fc510..0b38717c5f 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/header/header_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/header/header_module.ts @@ -15,10 +15,8 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {FormsModule} from '@angular/forms'; - import {MatCheckboxModule} from '@angular/material/checkbox'; import {MatIconModule} from '@angular/material/icon'; - import {HeaderComponent} from './header_component'; import {HeaderContainer} from './header_container'; diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/header/header_test.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/header/header_test.ts index af5a3fc41e..e9352a60d8 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/header/header_test.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/header/header_test.ts @@ -13,19 +13,17 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NO_ERRORS_SCHEMA} from '@angular/core'; -import {TestBed, ComponentFixture} from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - -import {Store, Action} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {Action, Store} from '@ngrx/store'; +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../../../app_state'; -import {HeaderComponent} from './header_component'; -import {HeaderContainer} from './header_container'; import * as npmiActions from '../../../actions'; +import {getAnnotationSort} from '../../../store'; import {SortOrder} from '../../../store/npmi_types'; import {appStateFromNpmiState, createNpmiState} from '../../../testing'; -import {getAnnotationSort} from '../../../store'; +import {HeaderComponent} from './header_component'; +import {HeaderContainer} from './header_container'; describe('Npmi Annotations List Header Container', () => { let store: MockStore; diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_element/legend_element_component.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_element/legend_element_component.ts index 46350e3d81..12f6b4048e 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_element/legend_element_component.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_element/legend_element_component.ts @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import { + AfterViewInit, ChangeDetectionStrategy, Component, + ElementRef, Input, - AfterViewInit, ViewChild, - ElementRef, } from '@angular/core'; import * as d3 from '../../../../../../third_party/d3'; diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_element/legend_element_module.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_element/legend_element_module.ts index 6272dac2b1..53804e650b 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_element/legend_element_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_element/legend_element_module.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {LegendElementComponent} from './legend_element_component'; @NgModule({ diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_element/legend_element_test.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_element/legend_element_test.ts index cf8137f5bd..a9da4b0dd9 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_element/legend_element_test.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_element/legend_element_test.ts @@ -12,9 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {TestBed, ComponentFixture} from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {LegendElementComponent} from './legend_element_component'; describe('Npmi Annotations Legend Element Container', () => { diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_module.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_module.ts index 0fb45faed7..110c62a1b8 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_module.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - import {LegendComponent} from './legend_component'; import {LegendElementModule} from './legend_element/legend_element_module'; diff --git a/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_test.ts b/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_test.ts index 703131218b..162f83e2ce 100644 --- a/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_test.ts +++ b/tensorboard/webapp/plugins/npmi/views/annotations_list/legend/legend_test.ts @@ -15,7 +15,6 @@ limitations under the License. import {NO_ERRORS_SCHEMA} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {LegendComponent} from './legend_component'; describe('Npmi Annotations Legend Container', () => { diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/data_selection_component.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/data_selection_component.ts index 8a52bcef0a..6bf733ca88 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/data_selection_component.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/data_selection_component.ts @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; @Component({ selector: 'npmi-data-selection', diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/data_selection_module.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/data_selection_module.ts index 8ee641f4b5..18cb3638f5 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/data_selection_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/data_selection_module.ts @@ -14,11 +14,10 @@ limitations under the License. ==============================================================================*/ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - -import {MetricSearchModule} from './metric_search/metric_search_module'; +import {DataSelectionComponent} from './data_selection_component'; import {MetricArithmeticModule} from './metric_arithmetic/metric_arithmetic_module'; +import {MetricSearchModule} from './metric_search/metric_search_module'; import {ResultsDownloadModule} from './results_download/results_download_module'; -import {DataSelectionComponent} from './data_selection_component'; @NgModule({ declarations: [DataSelectionComponent], diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/data_selection_test.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/data_selection_test.ts index 921b332b7f..64de06994c 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/data_selection_test.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/data_selection_test.ts @@ -18,14 +18,12 @@ limitations under the License. import {NO_ERRORS_SCHEMA} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {Store} from '@ngrx/store'; +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../../app_state'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - -import {DataSelectionComponent} from './data_selection_component'; +import {createCoreState, createState} from '../../../../core/testing'; import {appStateFromNpmiState, createNpmiState} from '../../testing'; -import {createState, createCoreState} from '../../../../core/testing'; +import {DataSelectionComponent} from './data_selection_component'; describe('Npmi Data Selection Container', () => { let store: MockStore; diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_container.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_container.ts index bc9e9b1094..e0d9beec5e 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_container.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_container.ts @@ -12,10 +12,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {Component, ChangeDetectionStrategy} from '@angular/core'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; import {select, Store} from '@ngrx/store'; -import {State} from '../../../store/npmi_types'; import {getMetricArithmetic} from '../../../store'; +import {State} from '../../../store/npmi_types'; @Component({ selector: 'npmi-metric-arithmetic', diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_element/metric_arithmetic_element_component.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_element/metric_arithmetic_element_component.ts index f986b6d384..ab52478b06 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_element/metric_arithmetic_element_component.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_element/metric_arithmetic_element_component.ts @@ -15,17 +15,17 @@ limitations under the License. import { ChangeDetectionStrategy, Component, - Input, - Output, EventEmitter, + Input, + OnChanges, OnDestroy, OnInit, - OnChanges, + Output, SimpleChanges, } from '@angular/core'; -import {Validators, FormControl, ValidationErrors} from '@angular/forms'; -import {takeUntil} from 'rxjs/operators'; +import {FormControl, ValidationErrors, Validators} from '@angular/forms'; import {Subject} from 'rxjs'; +import {takeUntil} from 'rxjs/operators'; @Component({ selector: 'metric-arithmetic-element-component', diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_element/metric_arithmetic_element_container.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_element/metric_arithmetic_element_container.ts index 8b10e9ff2d..0444f5cb48 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_element/metric_arithmetic_element_container.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_element/metric_arithmetic_element_container.ts @@ -12,18 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {Component, ChangeDetectionStrategy, Input} from '@angular/core'; +import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; import {select, Store} from '@ngrx/store'; - import {map} from 'rxjs/operators'; - -import {State} from '../../../../store/npmi_types'; +import * as npmiActions from '../../../../actions'; import { getEmbeddingDataSet, getEmbeddingsMetric, getMetricFilters, } from '../../../../store'; -import * as npmiActions from '../../../../actions'; +import {State} from '../../../../store/npmi_types'; @Component({ selector: 'npmi-metric-arithmetic-element', diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_element/metric_arithmetic_element_module.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_element/metric_arithmetic_element_module.ts index 2242b2e20c..8e5e96ac0b 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_element/metric_arithmetic_element_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_element/metric_arithmetic_element_module.ts @@ -15,10 +15,9 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; -import {MatIconModule} from '@angular/material/icon'; import {MatChipsModule} from '@angular/material/chips'; +import {MatIconModule} from '@angular/material/icon'; import {MatTooltipModule} from '@angular/material/tooltip'; - import {MetricArithmeticElementComponent} from './metric_arithmetic_element_component'; import {MetricArithmeticElementContainer} from './metric_arithmetic_element_container'; diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_element/metric_arithmetic_element_test.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_element/metric_arithmetic_element_test.ts index 1a9b723938..f7c253b1fe 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_element/metric_arithmetic_element_test.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_element/metric_arithmetic_element_test.ts @@ -17,28 +17,25 @@ limitations under the License. */ import {NO_ERRORS_SCHEMA} from '@angular/core'; import {TestBed} from '@angular/core/testing'; -import {By} from '@angular/platform-browser'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; - -import {MatInputModule} from '@angular/material/input'; import {MatChipsModule} from '@angular/material/chips'; - +import {MatInputModule} from '@angular/material/input'; +import {By} from '@angular/platform-browser'; import {Action, Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../../../../app_state'; +import * as npmiActions from '../../../../actions'; import { - getMetricFilters, getEmbeddingDataSet, + getMetricFilters, } from '../../../../store/npmi_selectors'; -import * as npmiActions from '../../../../actions'; import { appStateFromNpmiState, - createSampleEmbeddingData, createNpmiState, + createSampleEmbeddingData, } from '../../../../testing'; -import {MetricArithmeticElementContainer} from './metric_arithmetic_element_container'; import {MetricArithmeticElementComponent} from './metric_arithmetic_element_component'; +import {MetricArithmeticElementContainer} from './metric_arithmetic_element_container'; describe('Npmi Metric Arithmetic Element Container', () => { let store: MockStore; diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_module.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_module.ts index b4e2932450..bc18afcad2 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_module.ts @@ -15,7 +15,6 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {MatChipsModule} from '@angular/material/chips'; - import {MetricArithmeticComponent} from './metric_arithmetic_component'; import {MetricArithmeticContainer} from './metric_arithmetic_container'; import {MetricArithmeticElementModule} from './metric_arithmetic_element/metric_arithmetic_element_module'; diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_operator/metric_arithmetic_operator_module.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_operator/metric_arithmetic_operator_module.ts index cb6250f4c0..62741790eb 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_operator/metric_arithmetic_operator_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_operator/metric_arithmetic_operator_module.ts @@ -15,7 +15,6 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {MatChipsModule} from '@angular/material/chips'; - import {MetricArithmeticOperatorComponent} from './metric_arithmetic_operator_component'; @NgModule({ diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_operator/metric_arithmetic_operator_test.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_operator/metric_arithmetic_operator_test.ts index 486f447fd2..1fe1897842 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_operator/metric_arithmetic_operator_test.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_operator/metric_arithmetic_operator_test.ts @@ -17,9 +17,8 @@ limitations under the License. */ import {NO_ERRORS_SCHEMA} from '@angular/core'; import {TestBed} from '@angular/core/testing'; - -import {MetricArithmeticOperatorComponent} from './metric_arithmetic_operator_component'; import {Operator} from '../../../../store/npmi_types'; +import {MetricArithmeticOperatorComponent} from './metric_arithmetic_operator_component'; describe('Npmi Metric Arithmetic Operator Component', () => { beforeEach(async () => { diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_test.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_test.ts index 4dce97fc26..fad1e21aee 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_test.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_arithmetic/metric_arithmetic_test.ts @@ -18,19 +18,17 @@ limitations under the License. import {NO_ERRORS_SCHEMA} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {Store} from '@ngrx/store'; +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../../../app_state'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - -import {MetricArithmeticContainer} from './metric_arithmetic_container'; -import {MetricArithmeticComponent} from './metric_arithmetic_component'; +import {ArithmeticKind, Operator} from '../../../store/npmi_types'; import {appStateFromNpmiState, createNpmiState} from '../../../testing'; import { getMetricArithmetic, getMetricFilters, } from './../../../store/npmi_selectors'; -import {ArithmeticKind, Operator} from '../../../store/npmi_types'; +import {MetricArithmeticComponent} from './metric_arithmetic_component'; +import {MetricArithmeticContainer} from './metric_arithmetic_container'; describe('Npmi Metric Arithmetic Container', () => { let store: MockStore; diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_search/metric_search_component.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_search/metric_search_component.ts index 6919df96b3..5d0cb4cb87 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_search/metric_search_component.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_search/metric_search_component.ts @@ -15,10 +15,10 @@ limitations under the License. import { ChangeDetectionStrategy, Component, - Input, - Output, EventEmitter, HostBinding, + Input, + Output, } from '@angular/core'; import {MatAutocompleteSelectedEvent} from '@angular/material/autocomplete'; diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_search/metric_search_container.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_search/metric_search_container.ts index da1135d8a2..ef9b6118d6 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_search/metric_search_container.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_search/metric_search_container.ts @@ -12,20 +12,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {Component, ChangeDetectionStrategy} from '@angular/core'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; import {select, Store} from '@ngrx/store'; - -import {map} from 'rxjs/operators'; import {combineLatest} from 'rxjs'; - +import {map} from 'rxjs/operators'; import {State} from '../../../../../app_state'; +import {getCurrentRouteRunSelection} from '../../../../../selectors'; +import * as npmiActions from '../../../actions'; import { getMetricFilters, getMetricsRegex, getRunToMetrics, } from '../../../store'; -import {getCurrentRouteRunSelection} from '../../../../../selectors'; -import * as npmiActions from '../../../actions'; @Component({ selector: 'npmi-metric-search', diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_search/metric_search_module.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_search/metric_search_module.ts index 9008ad0893..b6dc3fa3a3 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_search/metric_search_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_search/metric_search_module.ts @@ -14,11 +14,9 @@ limitations under the License. ==============================================================================*/ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - -import {MatIconModule} from '@angular/material/icon'; import {MatAutocompleteModule} from '@angular/material/autocomplete'; +import {MatIconModule} from '@angular/material/icon'; import {MatInputModule} from '@angular/material/input'; - import {MetricSearchComponent} from './metric_search_component'; import {MetricSearchContainer} from './metric_search_container'; diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_search/metric_search_test.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_search/metric_search_test.ts index caaebdb298..fc0822b3d3 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/metric_search/metric_search_test.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/metric_search/metric_search_test.ts @@ -15,28 +15,25 @@ limitations under the License. /** * Unit tests for the Metric Search. */ -import {TestBed} from '@angular/core/testing'; -import {By} from '@angular/platform-browser'; -import {FormsModule} from '@angular/forms'; -import {CommonModule} from '@angular/common'; import {OverlayContainer} from '@angular/cdk/overlay'; +import {CommonModule} from '@angular/common'; import {DebugElement, getDebugNode, NO_ERRORS_SCHEMA} from '@angular/core'; - +import {TestBed} from '@angular/core/testing'; +import {FormsModule} from '@angular/forms'; import {MatAutocompleteModule} from '@angular/material/autocomplete'; import {MatInputModule} from '@angular/material/input'; - +import {By} from '@angular/platform-browser'; import {Action, Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../../../app_state'; import {getCurrentRouteRunSelection} from '../../../../../selectors'; +import * as npmiActions from '../../../actions'; +import {appStateFromNpmiState, createNpmiState} from '../../../testing'; import { getMetricFilters, getMetricsRegex, getRunToMetrics, } from './../../../store/npmi_selectors'; -import * as npmiActions from '../../../actions'; -import {appStateFromNpmiState, createNpmiState} from '../../../testing'; import {MetricSearchComponent} from './metric_search_component'; import {MetricSearchContainer} from './metric_search_container'; diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/results_download/results_download_component.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/results_download/results_download_component.ts index 1556c3ba63..e3cb0d6ccb 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/results_download/results_download_component.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/results_download/results_download_component.ts @@ -13,9 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; -import {ValueData} from './../../../store/npmi_types'; - import {convertToCSVResult} from '../../../util/csv_result'; +import {ValueData} from './../../../store/npmi_types'; @Component({ selector: 'results-download-component', diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/results_download/results_download_container.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/results_download/results_download_container.ts index c9cd29c908..b608462f73 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/results_download/results_download_container.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/results_download/results_download_container.ts @@ -12,20 +12,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {Component, ChangeDetectionStrategy} from '@angular/core'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; import {Store} from '@ngrx/store'; - import {combineLatest} from 'rxjs'; import {map} from 'rxjs/operators'; - import {State} from '../../../../../app_state'; +import {getCurrentRouteRunSelection} from '../../../../../selectors'; import { - getFlaggedAnnotations, getAnnotationData, - getRunToMetrics, + getFlaggedAnnotations, getMetricFilters, + getRunToMetrics, } from '../../../store'; -import {getCurrentRouteRunSelection} from '../../../../../selectors'; import {metricIsNpmiAndNotDiff} from '../../../util/metric_type'; @Component({ diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/results_download/results_download_module.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/results_download/results_download_module.ts index 6aab6791e2..2620a9c18f 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/results_download/results_download_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/results_download/results_download_module.ts @@ -14,10 +14,8 @@ limitations under the License. ==============================================================================*/ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - -import {MatIconModule} from '@angular/material/icon'; import {MatButtonModule} from '@angular/material/button'; - +import {MatIconModule} from '@angular/material/icon'; import {ResultsDownloadComponent} from './results_download_component'; import {ResultsDownloadContainer} from './results_download_container'; diff --git a/tensorboard/webapp/plugins/npmi/views/data_selection/results_download/results_download_test.ts b/tensorboard/webapp/plugins/npmi/views/data_selection/results_download/results_download_test.ts index 0da91714cb..2fe37ffc07 100644 --- a/tensorboard/webapp/plugins/npmi/views/data_selection/results_download/results_download_test.ts +++ b/tensorboard/webapp/plugins/npmi/views/data_selection/results_download/results_download_test.ts @@ -18,18 +18,15 @@ limitations under the License. import {NO_ERRORS_SCHEMA} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../../../app_state'; +import {createCoreState, createState} from '../../../../../core/testing'; import * as selectors from '../../../../../selectors'; +import {getFlaggedAnnotations} from '../../../store'; import {appStateFromNpmiState, createNpmiState} from '../../../testing'; -import {createState, createCoreState} from '../../../../../core/testing'; -import {ResultsDownloadContainer} from './results_download_container'; import {ResultsDownloadComponent} from './results_download_component'; - -import {getFlaggedAnnotations} from '../../../store'; +import {ResultsDownloadContainer} from './results_download_container'; describe('Npmi Results Download', () => { let store: MockStore; diff --git a/tensorboard/webapp/plugins/npmi/views/embeddings/embeddings_component.ts b/tensorboard/webapp/plugins/npmi/views/embeddings/embeddings_component.ts index 5dfb460191..ce6e169f56 100644 --- a/tensorboard/webapp/plugins/npmi/views/embeddings/embeddings_component.ts +++ b/tensorboard/webapp/plugins/npmi/views/embeddings/embeddings_component.ts @@ -15,9 +15,9 @@ limitations under the License. import { ChangeDetectionStrategy, Component, + EventEmitter, Input, Output, - EventEmitter, } from '@angular/core'; @Component({ diff --git a/tensorboard/webapp/plugins/npmi/views/embeddings/embeddings_container.ts b/tensorboard/webapp/plugins/npmi/views/embeddings/embeddings_container.ts index 3356ee12ac..50d951a2cb 100644 --- a/tensorboard/webapp/plugins/npmi/views/embeddings/embeddings_container.ts +++ b/tensorboard/webapp/plugins/npmi/views/embeddings/embeddings_container.ts @@ -12,18 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {Component, ChangeDetectionStrategy} from '@angular/core'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; import {select, Store} from '@ngrx/store'; - import {map} from 'rxjs/operators'; - import {State} from '../../../../app_state'; import {getCurrentRouteRunSelection} from '../../../../selectors'; +import * as npmiActions from '../../actions'; import { getEmbeddingsSidebarExpanded, getEmbeddingsSidebarWidth, } from './../../store/npmi_selectors'; -import * as npmiActions from '../../actions'; @Component({ selector: 'npmi-embeddings', diff --git a/tensorboard/webapp/plugins/npmi/views/embeddings/embeddings_module.ts b/tensorboard/webapp/plugins/npmi/views/embeddings/embeddings_module.ts index 2758109ded..517ebd55ba 100644 --- a/tensorboard/webapp/plugins/npmi/views/embeddings/embeddings_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/embeddings/embeddings_module.ts @@ -15,17 +15,15 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {FormsModule} from '@angular/forms'; - -import {MatCheckboxModule} from '@angular/material/checkbox'; import {MatButtonModule} from '@angular/material/button'; +import {MatCheckboxModule} from '@angular/material/checkbox'; import {MatIconModule} from '@angular/material/icon'; - -import {EmbeddingsComponent} from './embeddings_component'; -import {EmbeddingsContainer} from './embeddings_container'; import {RunsSelectorModule} from '../../../../runs/views/runs_selector/runs_selector_module'; -import {DataSelectionModule} from './../data_selection/data_selection_module'; import {AnnotationsListModule} from '../annotations_list/annotations_list_module'; +import {DataSelectionModule} from './../data_selection/data_selection_module'; import {SelectedAnnotationsModule} from './../selected_annotations/selected_annotations_module'; +import {EmbeddingsComponent} from './embeddings_component'; +import {EmbeddingsContainer} from './embeddings_container'; @NgModule({ declarations: [EmbeddingsComponent, EmbeddingsContainer], diff --git a/tensorboard/webapp/plugins/npmi/views/embeddings/embeddings_test.ts b/tensorboard/webapp/plugins/npmi/views/embeddings/embeddings_test.ts index fe5d5dca72..ea877e8e2b 100644 --- a/tensorboard/webapp/plugins/npmi/views/embeddings/embeddings_test.ts +++ b/tensorboard/webapp/plugins/npmi/views/embeddings/embeddings_test.ts @@ -15,22 +15,19 @@ limitations under the License. /** * Unit tests for the Main Container. */ +import {NO_ERRORS_SCHEMA} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - -import {Store, Action} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {Action, Store} from '@ngrx/store'; +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../../app_state'; +import {createCoreState, createState} from '../../../../core/testing'; +import * as npmiActions from '../../actions'; +import {appStateFromNpmiState, createNpmiState} from '../../testing'; import {getCurrentRouteRunSelection} from './../../../../selectors'; import {getEmbeddingsSidebarExpanded} from './../../store'; -import {appStateFromNpmiState, createNpmiState} from '../../testing'; -import {createState, createCoreState} from '../../../../core/testing'; import {EmbeddingsComponent} from './embeddings_component'; import {EmbeddingsContainer} from './embeddings_container'; -import * as npmiActions from '../../actions'; - -import {NO_ERRORS_SCHEMA} from '@angular/core'; describe('Npmi Embeddings Container', () => { let store: MockStore; diff --git a/tensorboard/webapp/plugins/npmi/views/inactive/inactive_module.ts b/tensorboard/webapp/plugins/npmi/views/inactive/inactive_module.ts index fc5a250275..34a188348c 100644 --- a/tensorboard/webapp/plugins/npmi/views/inactive/inactive_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/inactive/inactive_module.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - import {InactiveComponent} from './inactive_component'; @NgModule({ diff --git a/tensorboard/webapp/plugins/npmi/views/main/main_component.ts b/tensorboard/webapp/plugins/npmi/views/main/main_component.ts index 07dbde1ad2..67b6e8c828 100644 --- a/tensorboard/webapp/plugins/npmi/views/main/main_component.ts +++ b/tensorboard/webapp/plugins/npmi/views/main/main_component.ts @@ -15,9 +15,9 @@ limitations under the License. import { ChangeDetectionStrategy, Component, + EventEmitter, Input, Output, - EventEmitter, } from '@angular/core'; @Component({ diff --git a/tensorboard/webapp/plugins/npmi/views/main/main_container.ts b/tensorboard/webapp/plugins/npmi/views/main/main_container.ts index 0b306d0341..960ffece9c 100644 --- a/tensorboard/webapp/plugins/npmi/views/main/main_container.ts +++ b/tensorboard/webapp/plugins/npmi/views/main/main_container.ts @@ -12,18 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {Component, ChangeDetectionStrategy} from '@angular/core'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; import {select, Store} from '@ngrx/store'; - import {map} from 'rxjs/operators'; - import {State} from '../../../../app_state'; import {getCurrentRouteRunSelection} from '../../../../selectors'; +import * as npmiActions from '../../actions'; import { getSidebarExpanded, getSidebarWidth, } from './../../store/npmi_selectors'; -import * as npmiActions from '../../actions'; @Component({ selector: 'npmi-main', diff --git a/tensorboard/webapp/plugins/npmi/views/main/main_container_test.ts b/tensorboard/webapp/plugins/npmi/views/main/main_container_test.ts index 76bc68c136..278a22ccb7 100644 --- a/tensorboard/webapp/plugins/npmi/views/main/main_container_test.ts +++ b/tensorboard/webapp/plugins/npmi/views/main/main_container_test.ts @@ -15,22 +15,19 @@ limitations under the License. /** * Unit tests for the Main Container. */ +import {NO_ERRORS_SCHEMA} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - -import {Store, Action} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {Action, Store} from '@ngrx/store'; +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../../app_state'; -import {getCurrentRouteRunSelection} from './../../../../selectors'; +import {createCoreState, createState} from '../../../../core/testing'; +import * as npmiActions from '../../actions'; import {getSidebarExpanded} from '../../store'; import {appStateFromNpmiState, createNpmiState} from '../../testing'; -import {createState, createCoreState} from '../../../../core/testing'; +import {getCurrentRouteRunSelection} from './../../../../selectors'; import {MainComponent} from './main_component'; import {MainContainer} from './main_container'; -import * as npmiActions from '../../actions'; - -import {NO_ERRORS_SCHEMA} from '@angular/core'; describe('Npmi Main Container', () => { let store: MockStore; diff --git a/tensorboard/webapp/plugins/npmi/views/main/main_module.ts b/tensorboard/webapp/plugins/npmi/views/main/main_module.ts index 6ca25066af..030bf6f526 100644 --- a/tensorboard/webapp/plugins/npmi/views/main/main_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/main/main_module.ts @@ -15,18 +15,16 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {FormsModule} from '@angular/forms'; - -import {MatCheckboxModule} from '@angular/material/checkbox'; import {MatButtonModule} from '@angular/material/button'; +import {MatCheckboxModule} from '@angular/material/checkbox'; import {MatIconModule} from '@angular/material/icon'; - -import {MainComponent} from './main_component'; -import {MainContainer} from './main_container'; import {RunsSelectorModule} from '../../../../runs/views/runs_selector/runs_selector_module'; -import {DataSelectionModule} from './../data_selection/data_selection_module'; -import {ViolinFiltersModule} from './../violin_filters/violin_filters_module'; import {AnnotationsListModule} from '../annotations_list/annotations_list_module'; +import {DataSelectionModule} from './../data_selection/data_selection_module'; import {SelectedAnnotationsModule} from './../selected_annotations/selected_annotations_module'; +import {ViolinFiltersModule} from './../violin_filters/violin_filters_module'; +import {MainComponent} from './main_component'; +import {MainContainer} from './main_container'; @NgModule({ declarations: [MainComponent, MainContainer], diff --git a/tensorboard/webapp/plugins/npmi/views/selected_annotations/parallel_coordinates/parallel_coordinates_component.ts b/tensorboard/webapp/plugins/npmi/views/selected_annotations/parallel_coordinates/parallel_coordinates_component.ts index 13185e9bb7..cc74ca2853 100644 --- a/tensorboard/webapp/plugins/npmi/views/selected_annotations/parallel_coordinates/parallel_coordinates_component.ts +++ b/tensorboard/webapp/plugins/npmi/views/selected_annotations/parallel_coordinates/parallel_coordinates_component.ts @@ -13,20 +13,20 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import { + AfterViewInit, ChangeDetectionStrategy, Component, - AfterViewInit, + ElementRef, + HostListener, + Input, OnChanges, SimpleChanges, - Input, ViewChild, - ElementRef, - HostListener, } from '@angular/core'; import * as d3 from '../../../../../third_party/d3'; +import {RunColorScale} from '../../../../../types/ui'; import {Coordinate} from '../../../util/coordinate_data'; import {ValueData} from './../../../store/npmi_types'; -import {RunColorScale} from '../../../../../types/ui'; @Component({ selector: 'parallel-coordinates-component', diff --git a/tensorboard/webapp/plugins/npmi/views/selected_annotations/parallel_coordinates/parallel_coordinates_container.ts b/tensorboard/webapp/plugins/npmi/views/selected_annotations/parallel_coordinates/parallel_coordinates_container.ts index 9965a1df2e..b3f62b07d8 100644 --- a/tensorboard/webapp/plugins/npmi/views/selected_annotations/parallel_coordinates/parallel_coordinates_container.ts +++ b/tensorboard/webapp/plugins/npmi/views/selected_annotations/parallel_coordinates/parallel_coordinates_container.ts @@ -12,26 +12,26 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {Component, ChangeDetectionStrategy} from '@angular/core'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; import {select, Store} from '@ngrx/store'; -import {State} from '../../../../../app_state'; - -import {Observable, combineLatest} from 'rxjs'; +import {combineLatest, Observable} from 'rxjs'; import {map} from 'rxjs/operators'; - +import {State} from '../../../../../app_state'; +import * as selectors from '../../../../../selectors'; +import {getCurrentRouteRunSelection} from '../../../../../selectors'; +import {RunColorScale} from '../../../../../types/ui'; import { - getSelectedAnnotations, - getRunToMetrics, - getMetricFilters, getAnnotationData, + getMetricFilters, + getRunToMetrics, + getSelectedAnnotations, getSidebarWidth, } from '../../../store'; -import {getCurrentRouteRunSelection} from '../../../../../selectors'; -import {metricIsNpmiAndNotDiff} from '../../../util/metric_type'; import {convertToCoordinateData} from '../../../util/coordinate_data'; -import {stripMetricString} from '../../../util/metric_type'; -import * as selectors from '../../../../../selectors'; -import {RunColorScale} from '../../../../../types/ui'; +import { + metricIsNpmiAndNotDiff, + stripMetricString, +} from '../../../util/metric_type'; @Component({ selector: 'npmi-parallel-coordinates', diff --git a/tensorboard/webapp/plugins/npmi/views/selected_annotations/parallel_coordinates/parallel_coordinates_module.ts b/tensorboard/webapp/plugins/npmi/views/selected_annotations/parallel_coordinates/parallel_coordinates_module.ts index 7dee3b9e61..60d6bc7ab3 100644 --- a/tensorboard/webapp/plugins/npmi/views/selected_annotations/parallel_coordinates/parallel_coordinates_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/selected_annotations/parallel_coordinates/parallel_coordinates_module.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {ParallelCoordinatesComponent} from './parallel_coordinates_component'; import {ParallelCoordinatesContainer} from './parallel_coordinates_container'; diff --git a/tensorboard/webapp/plugins/npmi/views/selected_annotations/parallel_coordinates/parallel_coordinates_test.ts b/tensorboard/webapp/plugins/npmi/views/selected_annotations/parallel_coordinates/parallel_coordinates_test.ts index 1b483e7178..7c3809dbda 100644 --- a/tensorboard/webapp/plugins/npmi/views/selected_annotations/parallel_coordinates/parallel_coordinates_test.ts +++ b/tensorboard/webapp/plugins/npmi/views/selected_annotations/parallel_coordinates/parallel_coordinates_test.ts @@ -14,25 +14,23 @@ limitations under the License. ==============================================================================*/ import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../../../app_state'; -import {appStateFromNpmiState, createNpmiState} from '../../../testing'; -import {createState, createCoreState} from '../../../../../core/testing'; -import {ParallelCoordinatesComponent} from './parallel_coordinates_component'; -import {ParallelCoordinatesContainer} from './parallel_coordinates_container'; -import { - getSelectedAnnotations, - getRunToMetrics, - getMetricFilters, - getAnnotationData, -} from '../../../store'; +import {createCoreState, createState} from '../../../../../core/testing'; import { getCurrentRouteRunSelection, getRunColorMap, } from '../../../../../selectors'; +import { + getAnnotationData, + getMetricFilters, + getRunToMetrics, + getSelectedAnnotations, +} from '../../../store'; +import {appStateFromNpmiState, createNpmiState} from '../../../testing'; +import {ParallelCoordinatesComponent} from './parallel_coordinates_component'; +import {ParallelCoordinatesContainer} from './parallel_coordinates_container'; describe('Npmi Parallel Coordinates Container', () => { let store: MockStore; diff --git a/tensorboard/webapp/plugins/npmi/views/selected_annotations/selected_annotations_component.ts b/tensorboard/webapp/plugins/npmi/views/selected_annotations/selected_annotations_component.ts index 3b8c0d3a2b..460b82babd 100644 --- a/tensorboard/webapp/plugins/npmi/views/selected_annotations/selected_annotations_component.ts +++ b/tensorboard/webapp/plugins/npmi/views/selected_annotations/selected_annotations_component.ts @@ -15,9 +15,9 @@ limitations under the License. import { ChangeDetectionStrategy, Component, + EventEmitter, Input, Output, - EventEmitter, } from '@angular/core'; @Component({ diff --git a/tensorboard/webapp/plugins/npmi/views/selected_annotations/selected_annotations_container.ts b/tensorboard/webapp/plugins/npmi/views/selected_annotations/selected_annotations_container.ts index e9a01489f1..3463fecc5c 100644 --- a/tensorboard/webapp/plugins/npmi/views/selected_annotations/selected_annotations_container.ts +++ b/tensorboard/webapp/plugins/npmi/views/selected_annotations/selected_annotations_container.ts @@ -12,12 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {Component, ChangeDetectionStrategy} from '@angular/core'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; import {select, Store} from '@ngrx/store'; import {State} from '../../../../app_state'; - -import {getPCExpanded, getSelectedAnnotations} from '../../store'; import * as npmiActions from '../../actions'; +import {getPCExpanded, getSelectedAnnotations} from '../../store'; @Component({ selector: 'npmi-selected-annotations', diff --git a/tensorboard/webapp/plugins/npmi/views/selected_annotations/selected_annotations_module.ts b/tensorboard/webapp/plugins/npmi/views/selected_annotations/selected_annotations_module.ts index aa92e91101..e18d31c083 100644 --- a/tensorboard/webapp/plugins/npmi/views/selected_annotations/selected_annotations_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/selected_annotations/selected_annotations_module.ts @@ -14,13 +14,11 @@ limitations under the License. ==============================================================================*/ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {MatButtonModule} from '@angular/material/button'; import {MatIconModule} from '@angular/material/icon'; - +import {ParallelCoordinatesModule} from './parallel_coordinates/parallel_coordinates_module'; import {SelectedAnnotationsComponent} from './selected_annotations_component'; import {SelectedAnnotationsContainer} from './selected_annotations_container'; -import {ParallelCoordinatesModule} from './parallel_coordinates/parallel_coordinates_module'; @NgModule({ declarations: [SelectedAnnotationsComponent, SelectedAnnotationsContainer], diff --git a/tensorboard/webapp/plugins/npmi/views/selected_annotations/selected_annotations_test.ts b/tensorboard/webapp/plugins/npmi/views/selected_annotations/selected_annotations_test.ts index e0e56b62c5..b26a3957d9 100644 --- a/tensorboard/webapp/plugins/npmi/views/selected_annotations/selected_annotations_test.ts +++ b/tensorboard/webapp/plugins/npmi/views/selected_annotations/selected_annotations_test.ts @@ -18,16 +18,14 @@ limitations under the License. import {NO_ERRORS_SCHEMA} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - -import {Store, Action} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {Action, Store} from '@ngrx/store'; +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../../app_state'; -import {appStateFromNpmiState, createNpmiState} from '../../testing'; -import {SelectedAnnotationsContainer} from './selected_annotations_container'; -import {SelectedAnnotationsComponent} from './selected_annotations_component'; import * as npmiActions from '../../actions'; import {getPCExpanded, getSelectedAnnotations} from '../../store'; +import {appStateFromNpmiState, createNpmiState} from '../../testing'; +import {SelectedAnnotationsComponent} from './selected_annotations_component'; +import {SelectedAnnotationsContainer} from './selected_annotations_container'; describe('Npmi Selected Annotations', () => { let store: MockStore; diff --git a/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filter/violin_filter_component.ts b/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filter/violin_filter_component.ts index 6853658e71..87e15c72a3 100644 --- a/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filter/violin_filter_component.ts +++ b/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filter/violin_filter_component.ts @@ -13,23 +13,21 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import { + AfterViewInit, ChangeDetectionStrategy, Component, + ElementRef, + EventEmitter, Input, - Output, - AfterViewInit, OnChanges, + Output, SimpleChanges, - EventEmitter, ViewChild, - ElementRef, } from '@angular/core'; - import * as d3 from '../../../../../third_party/d3'; - -import {MetricFilter} from './../../../store/npmi_types'; -import {ViolinChartData, ViolinBin} from './../../../util/violin_data'; import {RunColorScale} from '../../../../../types/ui'; +import {MetricFilter} from './../../../store/npmi_types'; +import {ViolinBin, ViolinChartData} from './../../../util/violin_data'; @Component({ selector: 'violin-filter-component', diff --git a/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filter/violin_filter_container.ts b/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filter/violin_filter_container.ts index e6674008d1..63a9e82b9d 100644 --- a/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filter/violin_filter_container.ts +++ b/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filter/violin_filter_container.ts @@ -12,26 +12,24 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {Component, ChangeDetectionStrategy, Input, OnInit} from '@angular/core'; -import {Store, select} from '@ngrx/store'; - -import {Observable, combineLatest} from 'rxjs'; +import {ChangeDetectionStrategy, Component, Input, OnInit} from '@angular/core'; +import {select, Store} from '@ngrx/store'; +import {combineLatest, Observable} from 'rxjs'; import {map} from 'rxjs/operators'; - import {State} from '../../../../../app_state'; +import * as selectors from '../../../../../selectors'; import {getCurrentRouteRunSelection} from '../../../../../selectors'; +import {RunColorScale} from '../../../../../types/ui'; +import * as npmiActions from '../../../actions'; +import {MetricFilter} from '../../../store/npmi_types'; +import {removeHiddenAnnotations} from '../../../util/filter_annotations'; +import {ViolinChartData, violinData} from '../../../util/violin_data'; import { getAnnotationData, getHiddenAnnotations, getShowHiddenAnnotations, getSidebarWidth, } from './../../../store/npmi_selectors'; -import {MetricFilter} from '../../../store/npmi_types'; -import * as npmiActions from '../../../actions'; -import {removeHiddenAnnotations} from '../../../util/filter_annotations'; -import {violinData, ViolinChartData} from '../../../util/violin_data'; -import * as selectors from '../../../../../selectors'; -import {RunColorScale} from '../../../../../types/ui'; @Component({ selector: 'npmi-violin-filter', diff --git a/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filter/violin_filter_module.ts b/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filter/violin_filter_module.ts index d1fc9c6037..5d44e69111 100644 --- a/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filter/violin_filter_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filter/violin_filter_module.ts @@ -15,10 +15,8 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {FormsModule} from '@angular/forms'; - import {MatButtonModule} from '@angular/material/button'; import {MatIconModule} from '@angular/material/icon'; - import {ViolinFilterComponent} from './violin_filter_component'; import {ViolinFilterContainer} from './violin_filter_container'; diff --git a/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filter/violin_filter_test.ts b/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filter/violin_filter_test.ts index 75d0dcb890..427b2e857d 100644 --- a/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filter/violin_filter_test.ts +++ b/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filter/violin_filter_test.ts @@ -16,21 +16,19 @@ limitations under the License. * Unit tests for a violin filter. */ import {NO_ERRORS_SCHEMA} from '@angular/core'; -import {TestBed, ComponentFixture} from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {Action, Store} from '@ngrx/store'; +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../../../app_state'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - -import {ViolinFilterComponent} from './violin_filter_component'; -import {ViolinFilterContainer} from './violin_filter_container'; -import {appStateFromNpmiState, createNpmiState} from '../../../testing'; -import {createState, createCoreState} from '../../../../../core/testing'; +import {createCoreState, createState} from '../../../../../core/testing'; +import * as selectors from '../../../../../selectors'; +import {getCurrentRouteRunSelection} from '../../../../../selectors'; import * as npmiActions from '../../../actions'; import {getAnnotationData} from '../../../store'; -import {getCurrentRouteRunSelection} from '../../../../../selectors'; -import * as selectors from '../../../../../selectors'; +import {appStateFromNpmiState, createNpmiState} from '../../../testing'; +import {ViolinFilterComponent} from './violin_filter_component'; +import {ViolinFilterContainer} from './violin_filter_container'; describe('Npmi Violin Filter Container', () => { let store: MockStore; diff --git a/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filters_component.ts b/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filters_component.ts index 04919ec645..309180cb76 100644 --- a/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filters_component.ts +++ b/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filters_component.ts @@ -15,9 +15,9 @@ limitations under the License. import { ChangeDetectionStrategy, Component, + EventEmitter, Input, Output, - EventEmitter, } from '@angular/core'; import {MetricFilter} from '../../store/npmi_types'; diff --git a/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filters_container.ts b/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filters_container.ts index de12ee2cad..871b929140 100644 --- a/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filters_container.ts +++ b/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filters_container.ts @@ -12,14 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {Component, ChangeDetectionStrategy, Input} from '@angular/core'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; import {Store} from '@ngrx/store'; -import {State} from '../../../../app_state'; - import {map} from 'rxjs/operators'; - -import {getSidebarExpanded, getMetricFilters} from '../../store'; +import {State} from '../../../../app_state'; import * as npmiActions from '../../actions'; +import {getMetricFilters, getSidebarExpanded} from '../../store'; @Component({ selector: 'npmi-violin-filters', diff --git a/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filters_module.ts b/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filters_module.ts index ed8548ae99..74d7c49346 100644 --- a/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filters_module.ts +++ b/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filters_module.ts @@ -15,13 +15,11 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {FormsModule} from '@angular/forms'; - import {MatButtonModule} from '@angular/material/button'; import {MatIconModule} from '@angular/material/icon'; - +import {ViolinFilterModule} from './violin_filter/violin_filter_module'; import {ViolinFiltersComponent} from './violin_filters_component'; import {ViolinFiltersContainer} from './violin_filters_container'; -import {ViolinFilterModule} from './violin_filter/violin_filter_module'; @NgModule({ declarations: [ViolinFiltersComponent, ViolinFiltersContainer], diff --git a/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filters_test.ts b/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filters_test.ts index 105f12b2fd..366f5a77d0 100644 --- a/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filters_test.ts +++ b/tensorboard/webapp/plugins/npmi/views/violin_filters/violin_filters_test.ts @@ -18,17 +18,15 @@ limitations under the License. import {NO_ERRORS_SCHEMA} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {Action, Store} from '@ngrx/store'; +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../../app_state'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {createCoreState, createState} from '../../../../core/testing'; +import * as npmiActions from '../../actions'; +import {getMetricFilters, getSidebarExpanded} from '../../store'; +import {appStateFromNpmiState, createNpmiState} from '../../testing'; import {ViolinFiltersComponent} from './violin_filters_component'; import {ViolinFiltersContainer} from './violin_filters_container'; -import {appStateFromNpmiState, createNpmiState} from '../../testing'; -import {createState, createCoreState} from '../../../../core/testing'; -import * as npmiActions from '../../actions'; -import {getSidebarExpanded, getMetricFilters} from '../../store'; describe('Npmi Violin Filters Container', () => { let store: MockStore; diff --git a/tensorboard/webapp/plugins/plugin_registry_module.ts b/tensorboard/webapp/plugins/plugin_registry_module.ts index 9aedac662e..a857d4f8b9 100644 --- a/tensorboard/webapp/plugins/plugin_registry_module.ts +++ b/tensorboard/webapp/plugins/plugin_registry_module.ts @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import { - NgModule, Component, - Type, - ModuleWithProviders, Inject, + ModuleWithProviders, + NgModule, Optional, + Type, } from '@angular/core'; import {PluginConfig, PLUGIN_CONFIG_TOKEN} from './plugin_registry_types'; diff --git a/tensorboard/webapp/plugins/plugins_component.ts b/tensorboard/webapp/plugins/plugins_component.ts index e3fc3fc2ae..30e1717008 100644 --- a/tensorboard/webapp/plugins/plugins_component.ts +++ b/tensorboard/webapp/plugins/plugins_component.ts @@ -21,27 +21,25 @@ limitations under the License. import { ChangeDetectionStrategy, Component, + ComponentFactoryResolver, ElementRef, Input, OnChanges, Optional, SimpleChanges, + TemplateRef, ViewChild, - ComponentFactoryResolver, ViewContainerRef, - TemplateRef, } from '@angular/core'; - +import {PluginApiHostModule} from '../../components/experimental/plugin_util/plugin_api_host_module'; import {FeatureFlags} from '../feature_flag/types'; - -import {UiPluginMetadata} from './plugins_container'; import { - LoadingMechanismType, CustomElementLoadingMechanism, + LoadingMechanismType, } from '../types/api'; -import {PluginRegistryModule} from './plugin_registry_module'; -import {PluginApiHostModule} from '../../components/experimental/plugin_util/plugin_api_host_module'; import {DataLoadState} from '../types/data'; +import {UiPluginMetadata} from './plugins_container'; +import {PluginRegistryModule} from './plugin_registry_module'; interface PolymerDashboard extends HTMLElement { reload?: () => void; diff --git a/tensorboard/webapp/plugins/plugins_container.ts b/tensorboard/webapp/plugins/plugins_container.ts index b5efd1f762..9e5b471946 100644 --- a/tensorboard/webapp/plugins/plugins_container.ts +++ b/tensorboard/webapp/plugins/plugins_container.ts @@ -18,27 +18,25 @@ import { Input, TemplateRef, } from '@angular/core'; -import {Store, createSelector} from '@ngrx/store'; +import {createSelector, Store} from '@ngrx/store'; import {combineLatest} from 'rxjs'; import {map} from 'rxjs/operators'; - +import {State} from '../app_state'; import { - getPlugins, getActivePlugin, - getPluginsListLoaded, - getEnvironment, getAppLastLoadedTimeInMs, + getEnvironment, + getPlugins, + getPluginsListLoaded, } from '../core/store'; import {PluginsListFailureCode} from '../core/types'; -import {PluginMetadata} from '../types/api'; -import {DataLoadState} from '../types/data'; -import {State} from '../app_state'; import { getFeatureFlags, getIsFeatureFlagsLoaded, } from '../feature_flag/store/feature_flag_selectors'; import {selectors as settingsSelectors} from '../settings'; - +import {PluginMetadata} from '../types/api'; +import {DataLoadState} from '../types/data'; import {PluginLoadState} from './plugins_component'; export interface UiPluginMetadata extends PluginMetadata { diff --git a/tensorboard/webapp/plugins/plugins_container_test.ts b/tensorboard/webapp/plugins/plugins_container_test.ts index 6ce396f80e..923f15b43e 100644 --- a/tensorboard/webapp/plugins/plugins_container_test.ts +++ b/tensorboard/webapp/plugins/plugins_container_test.ts @@ -17,7 +17,6 @@ import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; import {Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; - import { getTestingProvider, PluginApiHostModule, diff --git a/tensorboard/webapp/plugins/plugins_module.ts b/tensorboard/webapp/plugins/plugins_module.ts index 6e435e28b6..2f62c8f41b 100644 --- a/tensorboard/webapp/plugins/plugins_module.ts +++ b/tensorboard/webapp/plugins/plugins_module.ts @@ -12,12 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; - -import {PluginsContainer} from './plugins_container'; -import {PluginsComponent} from './plugins_component'; +import {NgModule} from '@angular/core'; import {CoreModule} from '../core/core_module'; +import {PluginsComponent} from './plugins_component'; +import {PluginsContainer} from './plugins_container'; import {PluginRegistryModule} from './plugin_registry_module'; @NgModule({ diff --git a/tensorboard/webapp/plugins/text_v2/actions/text_actions.ts b/tensorboard/webapp/plugins/text_v2/actions/text_actions.ts index 2d74a76b58..741599cd34 100644 --- a/tensorboard/webapp/plugins/text_v2/actions/text_actions.ts +++ b/tensorboard/webapp/plugins/text_v2/actions/text_actions.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {createAction, props} from '@ngrx/store'; - import {StepDatum} from '../data_source'; import {TagGroup} from '../types'; diff --git a/tensorboard/webapp/plugins/text_v2/data_source/text_v2_data_source_module.ts b/tensorboard/webapp/plugins/text_v2/data_source/text_v2_data_source_module.ts index cbeaf2cb3d..03ea6b6161 100644 --- a/tensorboard/webapp/plugins/text_v2/data_source/text_v2_data_source_module.ts +++ b/tensorboard/webapp/plugins/text_v2/data_source/text_v2_data_source_module.ts @@ -13,9 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - import {TBHttpClientModule} from '../../../webapp_data_source/tb_http_client_module'; - import {TextV2DataSource} from './text_v2_data_source'; import {TextV2ServerDataSource} from './text_v2_server_data_source'; diff --git a/tensorboard/webapp/plugins/text_v2/data_source/text_v2_data_source_test.ts b/tensorboard/webapp/plugins/text_v2/data_source/text_v2_data_source_test.ts index 698215fc4a..835f678a16 100644 --- a/tensorboard/webapp/plugins/text_v2/data_source/text_v2_data_source_test.ts +++ b/tensorboard/webapp/plugins/text_v2/data_source/text_v2_data_source_test.ts @@ -13,12 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {TestBed} from '@angular/core/testing'; - import { - TBHttpClientTestingModule, HttpTestingController, + TBHttpClientTestingModule, } from '../../../webapp_data_source/tb_http_client_testing'; - import {TextV2ServerDataSource} from './text_v2_server_data_source'; describe('tb_server_data_source', () => { diff --git a/tensorboard/webapp/plugins/text_v2/data_source/text_v2_server_data_source.ts b/tensorboard/webapp/plugins/text_v2/data_source/text_v2_server_data_source.ts index 90093e7343..a9f7548ddd 100644 --- a/tensorboard/webapp/plugins/text_v2/data_source/text_v2_server_data_source.ts +++ b/tensorboard/webapp/plugins/text_v2/data_source/text_v2_server_data_source.ts @@ -14,9 +14,7 @@ limitations under the License. ==============================================================================*/ import {Injectable} from '@angular/core'; import {map} from 'rxjs/operators'; - import {TBHttpClient} from '../../../webapp_data_source/tb_http_client'; - import {TextV2DataSource} from './text_v2_data_source'; interface BackendRunToTagsMap { diff --git a/tensorboard/webapp/plugins/text_v2/effects/text_effects.ts b/tensorboard/webapp/plugins/text_v2/effects/text_effects.ts index fee2c5e49a..1c1783f183 100644 --- a/tensorboard/webapp/plugins/text_v2/effects/text_effects.ts +++ b/tensorboard/webapp/plugins/text_v2/effects/text_effects.ts @@ -13,31 +13,30 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Injectable} from '@angular/core'; -import {Store} from '@ngrx/store'; import {Actions, createEffect, ofType} from '@ngrx/effects'; -import {forkJoin, Observable, merge} from 'rxjs'; +import {Store} from '@ngrx/store'; +import {forkJoin, merge, Observable} from 'rxjs'; import { + last, map, mergeMap, - tap, switchMap, - last, + tap, withLatestFrom, } from 'rxjs/operators'; - +import {State} from '../../../app_state'; +import {manualReload, reload} from '../../../core/actions'; import { + textDataLoaded, textPluginLoaded, textRunToTagsLoaded, textTagGroupVisibilityChanged, - textDataLoaded, } from '../actions'; import {TextV2DataSource} from '../data_source/text_v2_data_source'; -import {State} from '../../../app_state'; import { - getTextData, getTextAllVisibleRunTags, + getTextData, } from '../store/text_v2_selectors'; -import {manualReload, reload} from '../../../core/actions'; @Injectable() export class TextEffects { diff --git a/tensorboard/webapp/plugins/text_v2/effects/text_effects_test.ts b/tensorboard/webapp/plugins/text_v2/effects/text_effects_test.ts index 4f06355fd1..0bdc13cf2d 100644 --- a/tensorboard/webapp/plugins/text_v2/effects/text_effects_test.ts +++ b/tensorboard/webapp/plugins/text_v2/effects/text_effects_test.ts @@ -13,32 +13,30 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {TestBed} from '@angular/core/testing'; - import {provideMockActions} from '@ngrx/effects/testing'; import {Action, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; -import {ReplaySubject, of} from 'rxjs'; - -import {TextEffects} from './text_effects'; +import {of, ReplaySubject} from 'rxjs'; +import {CategoryType} from '../../../../components/tf_categorization_utils/categorizationUtils'; +import {State} from '../../../app_state'; +import {manualReload, reload} from '../../../core/actions'; import { - textRunToTagsLoaded, + textDataLoaded, textPluginLoaded, + textRunToTagsLoaded, textTagGroupVisibilityChanged, - textDataLoaded, } from '../actions'; -import {State} from '../../../app_state'; import { - TextV2DataSource, RunToTags, StepDatum, + TextV2DataSource, } from '../data_source/text_v2_data_source'; -import {CategoryType} from '../../../../components/tf_categorization_utils/categorizationUtils'; +import {TextV2DataSourceModule} from '../data_source/text_v2_data_source_module'; import { - getTextData, getTextAllVisibleRunTags, + getTextData, } from '../store/text_v2_selectors'; -import {reload, manualReload} from '../../../core/actions'; -import {TextV2DataSourceModule} from '../data_source/text_v2_data_source_module'; +import {TextEffects} from './text_effects'; describe('text_effects', () => { let textEffects: TextEffects; diff --git a/tensorboard/webapp/plugins/text_v2/store/text_v2_reducers.ts b/tensorboard/webapp/plugins/text_v2/store/text_v2_reducers.ts index 90421018da..360e86a138 100644 --- a/tensorboard/webapp/plugins/text_v2/store/text_v2_reducers.ts +++ b/tensorboard/webapp/plugins/text_v2/store/text_v2_reducers.ts @@ -12,8 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {Action, createReducer, on} from '@ngrx/store'; - +import {Action, createReducer} from '@ngrx/store'; import {TextState} from './text_types'; const DATA_A_B_RUN1 = [ diff --git a/tensorboard/webapp/plugins/text_v2/store/text_v2_selectors.ts b/tensorboard/webapp/plugins/text_v2/store/text_v2_selectors.ts index a7391f97f8..668d05b73f 100644 --- a/tensorboard/webapp/plugins/text_v2/store/text_v2_selectors.ts +++ b/tensorboard/webapp/plugins/text_v2/store/text_v2_selectors.ts @@ -12,11 +12,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {createSelector, createFeatureSelector} from '@ngrx/store'; -import {TextState, State, TEXT_FEATURE_KEY} from './text_types'; - +import {createFeatureSelector, createSelector} from '@ngrx/store'; import {StepDatum} from '../data_source'; import {RunTag} from '../types'; +import {State, TextState, TEXT_FEATURE_KEY} from './text_types'; const selectTextState = createFeatureSelector( TEXT_FEATURE_KEY diff --git a/tensorboard/webapp/plugins/text_v2/store/text_v2_selectors_test.ts b/tensorboard/webapp/plugins/text_v2/store/text_v2_selectors_test.ts index b269895aad..52d0f683f8 100644 --- a/tensorboard/webapp/plugins/text_v2/store/text_v2_selectors_test.ts +++ b/tensorboard/webapp/plugins/text_v2/store/text_v2_selectors_test.ts @@ -13,9 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {buildStepDatum} from '../testing'; - -import * as selectors from './text_v2_selectors'; import {buildState, buildTextState} from './testing'; +import * as selectors from './text_v2_selectors'; describe('core selectors', () => { describe('#getTextRunToTags', () => { diff --git a/tensorboard/webapp/plugins/text_v2/text_v2_module.ts b/tensorboard/webapp/plugins/text_v2/text_v2_module.ts index c7d3fc587c..4d8cb0c090 100644 --- a/tensorboard/webapp/plugins/text_v2/text_v2_module.ts +++ b/tensorboard/webapp/plugins/text_v2/text_v2_module.ts @@ -17,14 +17,13 @@ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {EffectsModule} from '@ngrx/effects'; import {StoreModule} from '@ngrx/store'; - import {PluginRegistryModule} from '../plugin_registry_module'; -import {TextDashboardComponent} from './views/text_dashboard/text_dashboard_component'; -import {TextDashboardModule} from './views/text_dashboard/text_dashboard_module'; import {TextV2DataSourceModule} from './data_source/text_v2_data_source_module'; import {TextEffects} from './effects/text_effects'; -import {reducers} from './store/text_v2_reducers'; import {TEXT_FEATURE_KEY} from './store'; +import {reducers} from './store/text_v2_reducers'; +import {TextDashboardComponent} from './views/text_dashboard/text_dashboard_component'; +import {TextDashboardModule} from './views/text_dashboard/text_dashboard_module'; @NgModule({ imports: [ diff --git a/tensorboard/webapp/plugins/text_v2/views/text_dashboard/text_dashboard_module.ts b/tensorboard/webapp/plugins/text_v2/views/text_dashboard/text_dashboard_module.ts index 14ac675bc9..1c5c5957b2 100644 --- a/tensorboard/webapp/plugins/text_v2/views/text_dashboard/text_dashboard_module.ts +++ b/tensorboard/webapp/plugins/text_v2/views/text_dashboard/text_dashboard_module.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - import {TextDashboardComponent} from './text_dashboard_component'; @NgModule({ diff --git a/tensorboard/webapp/reloader/reloader_component.ts b/tensorboard/webapp/reloader/reloader_component.ts index a54f3d6808..71cc586e94 100644 --- a/tensorboard/webapp/reloader/reloader_component.ts +++ b/tensorboard/webapp/reloader/reloader_component.ts @@ -13,13 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {DOCUMENT} from '@angular/common'; -import {Component, ChangeDetectionStrategy, Inject} from '@angular/core'; -import {Store, select} from '@ngrx/store'; +import {ChangeDetectionStrategy, Component, Inject} from '@angular/core'; +import {select, Store} from '@ngrx/store'; import {combineLatest} from 'rxjs'; import {distinctUntilChanged} from 'rxjs/operators'; - -import {selectors as settingsSelectors, State} from '../settings'; import {reload} from '../core/actions'; +import {selectors as settingsSelectors, State} from '../settings'; @Component({ selector: 'reloader', diff --git a/tensorboard/webapp/reloader/reloader_component_test.ts b/tensorboard/webapp/reloader/reloader_component_test.ts index bfca654713..90f45b8ec7 100644 --- a/tensorboard/webapp/reloader/reloader_component_test.ts +++ b/tensorboard/webapp/reloader/reloader_component_test.ts @@ -13,18 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {DOCUMENT} from '@angular/common'; -import {TestBed, fakeAsync, tick} from '@angular/core/testing'; +import {fakeAsync, TestBed, tick} from '@angular/core/testing'; import {Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - -import {ReloaderComponent} from './reloader_component'; - +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {reload} from '../core/actions'; import { - createState, - createSettingsState, createSettings, + createSettingsState, + createState, } from '../settings/testing'; +import {ReloaderComponent} from './reloader_component'; describe('reloader_component', () => { let store: MockStore; diff --git a/tensorboard/webapp/reloader/reloader_module.ts b/tensorboard/webapp/reloader/reloader_module.ts index e45e583803..c6a95cf441 100644 --- a/tensorboard/webapp/reloader/reloader_module.ts +++ b/tensorboard/webapp/reloader/reloader_module.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - import {ReloaderComponent} from './reloader_component'; @NgModule({ diff --git a/tensorboard/webapp/routes/dashboard_deeplink_provider.ts b/tensorboard/webapp/routes/dashboard_deeplink_provider.ts index dc8de74b37..80d594e398 100644 --- a/tensorboard/webapp/routes/dashboard_deeplink_provider.ts +++ b/tensorboard/webapp/routes/dashboard_deeplink_provider.ts @@ -15,8 +15,7 @@ limitations under the License. import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; import {combineLatest, Observable} from 'rxjs'; -import {filter, map} from 'rxjs/operators'; - +import {map} from 'rxjs/operators'; import {DeepLinkProvider} from '../app_routing/deep_link_provider'; import {SerializableQueryParams} from '../app_routing/types'; import {State} from '../app_state'; @@ -29,14 +28,14 @@ import {CardUniqueInfo} from '../metrics/types'; import {GroupBy, GroupByKey} from '../runs/types'; import * as selectors from '../selectors'; import { - ENABLE_COLOR_GROUP_QUERY_PARAM_KEY, ENABLE_COLOR_GROUP_BY_REGEX_QUERY_PARAM_KEY, + ENABLE_COLOR_GROUP_QUERY_PARAM_KEY, EXPERIMENTAL_PLUGIN_QUERY_PARAM_KEY, } from '../webapp_data_source/tb_feature_flag_data_source_types'; import { - RUN_COLOR_GROUP_KEY, DeserializedState, PINNED_CARDS_KEY, + RUN_COLOR_GROUP_KEY, RUN_FILTER_KEY, SMOOTHING_KEY, TAG_FILTER_KEY, diff --git a/tensorboard/webapp/routes/dashboard_deeplink_provider_test.ts b/tensorboard/webapp/routes/dashboard_deeplink_provider_test.ts index a50725b85e..f4fb27f303 100644 --- a/tensorboard/webapp/routes/dashboard_deeplink_provider_test.ts +++ b/tensorboard/webapp/routes/dashboard_deeplink_provider_test.ts @@ -16,14 +16,13 @@ import {TestBed} from '@angular/core/testing'; import {Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {skip} from 'rxjs/operators'; - import {SerializableQueryParams} from '../app_routing/types'; import {State} from '../app_state'; import {PluginType} from '../metrics/data_source/types'; import {appStateFromMetricsState, buildMetricsState} from '../metrics/testing'; +import {GroupBy, GroupByKey} from '../runs/types'; import * as selectors from '../selectors'; import {DashboardDeepLinkProvider} from './dashboard_deeplink_provider'; -import {GroupBy, GroupByKey} from '../runs/types'; import {buildDeserializedState} from './testing'; describe('core deeplink provider', () => { diff --git a/tensorboard/webapp/routes/index.ts b/tensorboard/webapp/routes/index.ts index 4f1be9432a..4ee5ad1941 100644 --- a/tensorboard/webapp/routes/index.ts +++ b/tensorboard/webapp/routes/index.ts @@ -13,10 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Component, Type} from '@angular/core'; - -import {TensorBoardWrapperComponent} from '../tb_wrapper/tb_wrapper_component'; import {RouteDef} from '../app_routing/route_config_types'; import {RouteKind} from '../app_routing/types'; +import {TensorBoardWrapperComponent} from '../tb_wrapper/tb_wrapper_component'; import {DashboardDeepLinkProvider} from './dashboard_deeplink_provider'; export function routesFactory(): RouteDef[] { diff --git a/tensorboard/webapp/runs/actions/runs_actions.ts b/tensorboard/webapp/runs/actions/runs_actions.ts index 72ec4af44d..0dc7066bee 100644 --- a/tensorboard/webapp/runs/actions/runs_actions.ts +++ b/tensorboard/webapp/runs/actions/runs_actions.ts @@ -17,7 +17,6 @@ limitations under the License. */ import {createAction, props} from '@ngrx/store'; - import {SortDirection} from '../../types/ui'; import {Run} from '../data_source/runs_data_source_types'; import {ExperimentIdToRunsAndMetadata, GroupBy, SortKey} from '../types'; diff --git a/tensorboard/webapp/runs/data_source/runs_data_source.ts b/tensorboard/webapp/runs/data_source/runs_data_source.ts index cec9704edf..6c7c309d73 100644 --- a/tensorboard/webapp/runs/data_source/runs_data_source.ts +++ b/tensorboard/webapp/runs/data_source/runs_data_source.ts @@ -15,9 +15,7 @@ limitations under the License. import {Injectable} from '@angular/core'; import {Observable, of} from 'rxjs'; import {map} from 'rxjs/operators'; - import {TBHttpClient} from '../../webapp_data_source/tb_http_client'; - import { HparamsAndMetadata, Run, diff --git a/tensorboard/webapp/runs/data_source/runs_data_source_module.ts b/tensorboard/webapp/runs/data_source/runs_data_source_module.ts index 48ff68485b..9fdc223367 100644 --- a/tensorboard/webapp/runs/data_source/runs_data_source_module.ts +++ b/tensorboard/webapp/runs/data_source/runs_data_source_module.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - import {TBRunsDataSource} from './runs_data_source'; import {RunsDataSource} from './runs_data_source_types'; diff --git a/tensorboard/webapp/runs/data_source/runs_data_source_test.ts b/tensorboard/webapp/runs/data_source/runs_data_source_test.ts index 806a3bd496..bba145b027 100644 --- a/tensorboard/webapp/runs/data_source/runs_data_source_test.ts +++ b/tensorboard/webapp/runs/data_source/runs_data_source_test.ts @@ -13,12 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {fakeAsync, flush, TestBed} from '@angular/core/testing'; - import { HttpTestingController, TBHttpClientTestingModule, } from '../../webapp_data_source/tb_http_client_testing'; - import {TBRunsDataSource} from './runs_data_source'; import {RunsDataSource} from './runs_data_source_types'; diff --git a/tensorboard/webapp/runs/data_source/runs_data_source_types.ts b/tensorboard/webapp/runs/data_source/runs_data_source_types.ts index 4add0d4746..a62365dadc 100644 --- a/tensorboard/webapp/runs/data_source/runs_data_source_types.ts +++ b/tensorboard/webapp/runs/data_source/runs_data_source_types.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {Injectable} from '@angular/core'; import {Observable} from 'rxjs'; - import * as backendTypes from './runs_backend_types'; export { diff --git a/tensorboard/webapp/runs/data_source/testing.ts b/tensorboard/webapp/runs/data_source/testing.ts index e1d72c58bd..2b7c3253bb 100644 --- a/tensorboard/webapp/runs/data_source/testing.ts +++ b/tensorboard/webapp/runs/data_source/testing.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {Injectable} from '@angular/core'; import {Observable, of} from 'rxjs'; - import {BackendHparamsValueType, DatasetType} from './runs_backend_types'; import { DomainType, diff --git a/tensorboard/webapp/runs/effects/runs_effects.ts b/tensorboard/webapp/runs/effects/runs_effects.ts index 65917a4b6b..534abcbd92 100644 --- a/tensorboard/webapp/runs/effects/runs_effects.ts +++ b/tensorboard/webapp/runs/effects/runs_effects.ts @@ -15,8 +15,6 @@ limitations under the License. import {Injectable} from '@angular/core'; import {Actions, createEffect, ofType} from '@ngrx/effects'; import {Store} from '@ngrx/store'; -import * as coreActions from '../../core/actions'; -import {DataLoadState, LoadState} from '../../types/data'; import {forkJoin, merge, Observable, of, throwError} from 'rxjs'; import { catchError, @@ -28,19 +26,22 @@ import { tap, withLatestFrom, } from 'rxjs/operators'; - import {navigated} from '../../app_routing/actions'; import {State} from '../../app_state'; +import * as coreActions from '../../core/actions'; import { getExperimentIdsFromRoute, getRouteId, getRuns, getRunsLoadState, } from '../../selectors'; +import {DataLoadState, LoadState} from '../../types/data'; import * as actions from '../actions'; -import {Run} from '../data_source/runs_data_source_types'; -import {RunsDataSource} from '../data_source/runs_data_source_types'; -import {HparamsAndMetadata} from '../data_source/runs_data_source_types'; +import { + HparamsAndMetadata, + Run, + RunsDataSource, +} from '../data_source/runs_data_source_types'; import {ExperimentIdToRunsAndMetadata} from '../types'; /** diff --git a/tensorboard/webapp/runs/effects/runs_effects_test.ts b/tensorboard/webapp/runs/effects/runs_effects_test.ts index 33fd4b6e75..8d3f2e2855 100644 --- a/tensorboard/webapp/runs/effects/runs_effects_test.ts +++ b/tensorboard/webapp/runs/effects/runs_effects_test.ts @@ -16,27 +16,24 @@ import {TestBed} from '@angular/core/testing'; import {provideMockActions} from '@ngrx/effects/testing'; import {Action, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; -import * as coreActions from '../../core/actions'; -import {DataLoadState} from '../../types/data'; import {of, ReplaySubject} from 'rxjs'; - import {buildNavigatedAction} from '../../app_routing/testing'; import {State} from '../../app_state'; +import * as coreActions from '../../core/actions'; import { getExperimentIdsFromRoute, getRouteId, getRuns, getRunsLoadState, } from '../../selectors'; -import {Run} from '../data_source/runs_data_source_types'; +import {DataLoadState} from '../../types/data'; import * as actions from '../actions'; -import {HparamsAndMetadata} from '../data_source/runs_data_source_types'; +import {HparamsAndMetadata, Run} from '../data_source/runs_data_source_types'; import { buildHparamsAndMetadata, provideTestingRunsDataSource, TestingRunsDataSource, } from '../data_source/testing'; - import {RunsEffects} from './index'; function createRun(override: Partial = {}) { diff --git a/tensorboard/webapp/runs/store/runs_selectors.ts b/tensorboard/webapp/runs/store/runs_selectors.ts index c94659fd97..0f42d59f8f 100644 --- a/tensorboard/webapp/runs/store/runs_selectors.ts +++ b/tensorboard/webapp/runs/store/runs_selectors.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {createFeatureSelector, createSelector} from '@ngrx/store'; - import {DataLoadState, LoadState} from '../../types/data'; import {SortDirection} from '../../types/ui'; import {GroupBy, SortKey} from '../types'; diff --git a/tensorboard/webapp/runs/views/runs_selector/runs_selector_component.ts b/tensorboard/webapp/runs/views/runs_selector/runs_selector_component.ts index 1a2c565600..bf61e3fe3a 100644 --- a/tensorboard/webapp/runs/views/runs_selector/runs_selector_component.ts +++ b/tensorboard/webapp/runs/views/runs_selector/runs_selector_component.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; - import {RunsTableColumn} from '../runs_table/types'; @Component({ diff --git a/tensorboard/webapp/runs/views/runs_selector/runs_selector_container.ts b/tensorboard/webapp/runs/views/runs_selector/runs_selector_container.ts index 61eaaec033..b87e3a357d 100644 --- a/tensorboard/webapp/runs/views/runs_selector/runs_selector_container.ts +++ b/tensorboard/webapp/runs/views/runs_selector/runs_selector_container.ts @@ -15,7 +15,6 @@ limitations under the License. import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; import {Store} from '@ngrx/store'; import {map} from 'rxjs/operators'; - import {State} from '../../../app_state'; import {getExperimentIdsFromRoute} from '../../../selectors'; import {RunsTableColumn} from '../runs_table/types'; diff --git a/tensorboard/webapp/runs/views/runs_selector/runs_selector_module.ts b/tensorboard/webapp/runs/views/runs_selector/runs_selector_module.ts index 257e282904..18455cc671 100644 --- a/tensorboard/webapp/runs/views/runs_selector/runs_selector_module.ts +++ b/tensorboard/webapp/runs/views/runs_selector/runs_selector_module.ts @@ -21,9 +21,7 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {RunsTableModule} from '../runs_table/runs_table_module'; - import {RunsSelectorComponent} from './runs_selector_component'; import {RunsSelectorContainer} from './runs_selector_container'; diff --git a/tensorboard/webapp/runs/views/runs_selector/runs_selector_test.ts b/tensorboard/webapp/runs/views/runs_selector/runs_selector_test.ts index 1470eda063..12c6ef7f25 100644 --- a/tensorboard/webapp/runs/views/runs_selector/runs_selector_test.ts +++ b/tensorboard/webapp/runs/views/runs_selector/runs_selector_test.ts @@ -18,7 +18,6 @@ import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; - import {State} from '../../../app_state'; import {getExperimentIdsFromRoute} from '../../../selectors'; import {RunsTableColumn} from '../runs_table/types'; diff --git a/tensorboard/webapp/runs/views/runs_table/regex_edit_dialog_container.ts b/tensorboard/webapp/runs/views/runs_table/regex_edit_dialog_container.ts index 2ef147482e..7c466d80c9 100644 --- a/tensorboard/webapp/runs/views/runs_table/regex_edit_dialog_container.ts +++ b/tensorboard/webapp/runs/views/runs_table/regex_edit_dialog_container.ts @@ -24,7 +24,6 @@ import { startWith, take, } from 'rxjs/operators'; - import {State} from '../../../app_state'; import {getDarkModeEnabled} from '../../../selectors'; import {selectors as settingsSelectors} from '../../../settings/'; diff --git a/tensorboard/webapp/runs/views/runs_table/regex_edit_dialog_test.ts b/tensorboard/webapp/runs/views/runs_table/regex_edit_dialog_test.ts index 428ae65d5c..fdcd374c20 100644 --- a/tensorboard/webapp/runs/views/runs_table/regex_edit_dialog_test.ts +++ b/tensorboard/webapp/runs/views/runs_table/regex_edit_dialog_test.ts @@ -30,7 +30,6 @@ import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Action, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; - import {State} from '../../../app_state'; import { getColorGroupRegexString, diff --git a/tensorboard/webapp/runs/views/runs_table/runs_group_menu_button_component.ts b/tensorboard/webapp/runs/views/runs_table/runs_group_menu_button_component.ts index b14337b0a2..418da889a7 100644 --- a/tensorboard/webapp/runs/views/runs_table/runs_group_menu_button_component.ts +++ b/tensorboard/webapp/runs/views/runs_table/runs_group_menu_button_component.ts @@ -20,7 +20,6 @@ import { Output, } from '@angular/core'; import {MatDialog} from '@angular/material/dialog'; - import {GroupBy, GroupByKey} from '../../types'; import {RegexEditDialogContainer} from './regex_edit_dialog_container'; diff --git a/tensorboard/webapp/runs/views/runs_table/runs_group_menu_button_container.ts b/tensorboard/webapp/runs/views/runs_table/runs_group_menu_button_container.ts index 5430836597..eed3ca3c50 100644 --- a/tensorboard/webapp/runs/views/runs_table/runs_group_menu_button_container.ts +++ b/tensorboard/webapp/runs/views/runs_table/runs_group_menu_button_container.ts @@ -16,13 +16,11 @@ import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; import {Store} from '@ngrx/store'; import {Observable} from 'rxjs'; import {map} from 'rxjs/operators'; - import {RouteKind} from '../../../app_routing/types'; - import {State} from '../../../app_state'; import { - getRegisteredRouteKinds, getEnabledColorGroupByRegex, + getRegisteredRouteKinds, } from '../../../selectors'; import {runGroupByChanged} from '../../actions'; import { diff --git a/tensorboard/webapp/runs/views/runs_table/runs_table_component.ts b/tensorboard/webapp/runs/views/runs_table/runs_table_component.ts index 8ed63b2224..a815a39c37 100644 --- a/tensorboard/webapp/runs/views/runs_table/runs_table_component.ts +++ b/tensorboard/webapp/runs/views/runs_table/runs_table_component.ts @@ -23,21 +23,18 @@ import { Output, ViewChild, } from '@angular/core'; -import {MatPaginator} from '@angular/material/paginator'; -import {MatPaginatorIntl} from '@angular/material/paginator'; +import {MatPaginator, MatPaginatorIntl} from '@angular/material/paginator'; import {MatSort, Sort} from '@angular/material/sort'; import {MatTableDataSource} from '@angular/material/table'; - -import {SortDirection} from '../../../types/ui'; import { - DiscreteHparamValues, + DiscreteFilter, DiscreteHparamValue, + DiscreteHparamValues, DomainType, - DiscreteFilter, IntervalFilter, } from '../../../hparams/types'; +import {SortDirection} from '../../../types/ui'; import {SortKey, SortType} from '../../types'; - import {HparamSpec, MetricSpec, RunsTableColumn, RunTableItem} from './types'; /** diff --git a/tensorboard/webapp/runs/views/runs_table/runs_table_container.ts b/tensorboard/webapp/runs/views/runs_table/runs_table_container.ts index 0418802f61..269439319b 100644 --- a/tensorboard/webapp/runs/views/runs_table/runs_table_container.ts +++ b/tensorboard/webapp/runs/views/runs_table/runs_table_container.ts @@ -30,9 +30,9 @@ import { take, takeUntil, } from 'rxjs/operators'; - import * as alertActions from '../../../alert/actions'; import {State} from '../../../app_state'; +import {ExperimentAlias} from '../../../experiments/types'; import { actions as hparamsActions, selectors as hparamsSelectors, @@ -69,7 +69,6 @@ import { runSelectorSortChanged, runTableShown, } from '../../actions'; -import {ExperimentAlias} from '../../../experiments/types'; import {MAX_NUM_RUNS_TO_ENABLE_BY_DEFAULT} from '../../store/runs_types'; import {SortKey, SortType} from '../../types'; import { diff --git a/tensorboard/webapp/runs/views/runs_table/runs_table_module.ts b/tensorboard/webapp/runs/views/runs_table/runs_table_module.ts index 432900deb3..91f82aaa87 100644 --- a/tensorboard/webapp/runs/views/runs_table/runs_table_module.ts +++ b/tensorboard/webapp/runs/views/runs_table/runs_table_module.ts @@ -30,7 +30,6 @@ import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import {MatSortModule} from '@angular/material/sort'; import {MatTableModule} from '@angular/material/table'; import {ColorPickerModule} from 'ngx-color-picker'; - import {AlertModule} from '../../../alert/alert_module'; import {ExperimentAliasModule} from '../../../widgets/experiment_alias/experiment_alias_module'; import {FilterInputModule} from '../../../widgets/filter_input/filter_input_module'; diff --git a/tensorboard/webapp/runs/views/runs_table/runs_table_test.ts b/tensorboard/webapp/runs/views/runs_table/runs_table_test.ts index fb7cb4f1d4..7193c4c843 100644 --- a/tensorboard/webapp/runs/views/runs_table/runs_table_test.ts +++ b/tensorboard/webapp/runs/views/runs_table/runs_table_test.ts @@ -39,7 +39,6 @@ import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Action, Store} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {of, ReplaySubject} from 'rxjs'; - import * as alertActions from '../../../alert/actions'; import {RouteKind} from '../../../app_routing/types'; import {State} from '../../../app_state'; @@ -80,6 +79,7 @@ import {sendKeys} from '../../../testing/dom'; import {MatIconTestingModule} from '../../../testing/mat_icon_module'; import {DataLoadState} from '../../../types/data'; import {SortDirection} from '../../../types/ui'; +import {ExperimentAliasModule} from '../../../widgets/experiment_alias/experiment_alias_module'; import {FilterInputModule} from '../../../widgets/filter_input/filter_input_module'; import {RangeInputModule} from '../../../widgets/range_input/range_input_module'; import { @@ -101,7 +101,6 @@ import {RunsGroupMenuButtonContainer} from './runs_group_menu_button_container'; import {RunsTableComponent} from './runs_table_component'; import {RunsTableContainer, TEST_ONLY} from './runs_table_container'; import {HparamSpec, MetricSpec, RunsTableColumn} from './types'; -import {ExperimentAliasModule} from '../../../widgets/experiment_alias/experiment_alias_module'; @Injectable() class ColorPickerTestHelper { diff --git a/tensorboard/webapp/runs/views/runs_table/types.ts b/tensorboard/webapp/runs/views/runs_table/types.ts index 3eba0951bd..0e2753cc24 100644 --- a/tensorboard/webapp/runs/views/runs_table/types.ts +++ b/tensorboard/webapp/runs/views/runs_table/types.ts @@ -12,22 +12,22 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +import {ExperimentAlias} from '../../../experiments/types'; import { HparamValue, MetricValue, } from '../../data_source/runs_data_source_types'; import {Run} from '../../store/runs_types'; -export {HparamValue} from '../../data_source/runs_data_source_types'; export { DiscreteHparamValue, DiscreteHparamValues, Domain, DomainType, HparamSpec, + HparamValue, MetricSpec, } from '../../data_source/runs_data_source_types'; -import {ExperimentAlias} from '../../../experiments/types'; export enum RunsTableColumn { CHECKBOX = 'checkbox', diff --git a/tensorboard/webapp/runs_legacy/runs_module.ts b/tensorboard/webapp/runs_legacy/runs_module.ts index 89b936c7ea..6145657782 100644 --- a/tensorboard/webapp/runs_legacy/runs_module.ts +++ b/tensorboard/webapp/runs_legacy/runs_module.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - import {LegacyRunsSelectorModule as LegacyRunsSelectorViewModule} from './views/legacy_runs_selector/legacy_runs_selector_module'; @NgModule({ diff --git a/tensorboard/webapp/runs_legacy/views/legacy_runs_selector/legacy_runs_selector_component.ts b/tensorboard/webapp/runs_legacy/views/legacy_runs_selector/legacy_runs_selector_component.ts index 156ba70a58..a97a007687 100644 --- a/tensorboard/webapp/runs_legacy/views/legacy_runs_selector/legacy_runs_selector_component.ts +++ b/tensorboard/webapp/runs_legacy/views/legacy_runs_selector/legacy_runs_selector_component.ts @@ -17,8 +17,8 @@ import { Component, ElementRef, EventEmitter, - ViewChild, Output, + ViewChild, } from '@angular/core'; interface PolymerChangeEvent extends CustomEvent { diff --git a/tensorboard/webapp/runs_legacy/views/legacy_runs_selector/legacy_runs_selector_container.ts b/tensorboard/webapp/runs_legacy/views/legacy_runs_selector/legacy_runs_selector_container.ts index 72e7ba7581..ca848414c1 100644 --- a/tensorboard/webapp/runs_legacy/views/legacy_runs_selector/legacy_runs_selector_container.ts +++ b/tensorboard/webapp/runs_legacy/views/legacy_runs_selector/legacy_runs_selector_container.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {Component} from '@angular/core'; import {Store} from '@ngrx/store'; - import {State} from '../../../app_state'; import {polymerInteropRunSelectionChanged} from '../../../core/actions'; diff --git a/tensorboard/webapp/runs_legacy/views/legacy_runs_selector/legacy_runs_selector_module.ts b/tensorboard/webapp/runs_legacy/views/legacy_runs_selector/legacy_runs_selector_module.ts index 543b93dcb8..098fd4552b 100644 --- a/tensorboard/webapp/runs_legacy/views/legacy_runs_selector/legacy_runs_selector_module.ts +++ b/tensorboard/webapp/runs_legacy/views/legacy_runs_selector/legacy_runs_selector_module.ts @@ -12,8 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {NgModule, CUSTOM_ELEMENTS_SCHEMA} from '@angular/core'; - +import {CUSTOM_ELEMENTS_SCHEMA, NgModule} from '@angular/core'; import {LegacyRunsSelectorComponent} from './legacy_runs_selector_component'; import {LegacyRunsSelectorContainer} from './legacy_runs_selector_container'; diff --git a/tensorboard/webapp/runs_legacy/views/legacy_runs_selector/legacy_runs_selector_test.ts b/tensorboard/webapp/runs_legacy/views/legacy_runs_selector/legacy_runs_selector_test.ts index 3129b8ccc9..c5cfb870fb 100644 --- a/tensorboard/webapp/runs_legacy/views/legacy_runs_selector/legacy_runs_selector_test.ts +++ b/tensorboard/webapp/runs_legacy/views/legacy_runs_selector/legacy_runs_selector_test.ts @@ -12,19 +12,17 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {By} from '@angular/platform-browser'; import {NO_ERRORS_SCHEMA} from '@angular/core'; import {TestBed} from '@angular/core/testing'; +import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; -import {Store, Action} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {Action, Store} from '@ngrx/store'; +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../../../app_state'; -import {createState, createCoreState} from '../../../core/testing'; import {polymerInteropRunSelectionChanged} from '../../../core/actions'; - -import {LegacyRunsSelectorContainer} from './legacy_runs_selector_container'; +import {createCoreState, createState} from '../../../core/testing'; import {LegacyRunsSelectorComponent} from './legacy_runs_selector_component'; +import {LegacyRunsSelectorContainer} from './legacy_runs_selector_container'; describe('legacy_runs_selector test', () => { let store: MockStore; diff --git a/tensorboard/webapp/settings/_redux/settings_reducers.ts b/tensorboard/webapp/settings/_redux/settings_reducers.ts index b341eadafe..ed7c32ea95 100644 --- a/tensorboard/webapp/settings/_redux/settings_reducers.ts +++ b/tensorboard/webapp/settings/_redux/settings_reducers.ts @@ -16,7 +16,7 @@ import {Action, createReducer, on} from '@ngrx/store'; import {globalSettingsLoaded} from '../../persistent_settings'; import {DataLoadState} from '../../types/data'; import * as actions from './settings_actions'; -import {SettingsState, initialState, Settings} from './settings_types'; +import {initialState, Settings, SettingsState} from './settings_types'; /** * Check if settings are ready to modify. We want to reject modifications to diff --git a/tensorboard/webapp/settings/_redux/settings_reducers_test.ts b/tensorboard/webapp/settings/_redux/settings_reducers_test.ts index 827fa5eabc..200e1dc059 100644 --- a/tensorboard/webapp/settings/_redux/settings_reducers_test.ts +++ b/tensorboard/webapp/settings/_redux/settings_reducers_test.ts @@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +import {globalSettingsLoaded} from '../../persistent_settings'; +import {DataLoadState} from '../../types/data'; +import {createSettings, createSettingsState} from '../testing'; import * as actions from './settings_actions'; import {reducers} from './settings_reducers'; -import {createSettings, createSettingsState} from '../testing'; -import {DataLoadState} from '../../types/data'; -import {globalSettingsLoaded} from '../../persistent_settings'; describe('settings reducer', () => { describe('#toggleReloadEnabled', () => { diff --git a/tensorboard/webapp/settings/_redux/settings_selectors.ts b/tensorboard/webapp/settings/_redux/settings_selectors.ts index 0c7031cc48..8a997ae168 100644 --- a/tensorboard/webapp/settings/_redux/settings_selectors.ts +++ b/tensorboard/webapp/settings/_redux/settings_selectors.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {createFeatureSelector, createSelector} from '@ngrx/store'; - import {DataLoadState} from '../../types/data'; import {ColorPalette} from '../../util/colors'; import {SettingsState, SETTINGS_FEATURE_KEY, State} from './settings_types'; diff --git a/tensorboard/webapp/settings/_views/polymer_interop_container.ts b/tensorboard/webapp/settings/_views/polymer_interop_container.ts index ac26c0a7ab..b590395109 100644 --- a/tensorboard/webapp/settings/_views/polymer_interop_container.ts +++ b/tensorboard/webapp/settings/_views/polymer_interop_container.ts @@ -12,13 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import '../../tb_polymer_interop_types'; - -import {Component, ChangeDetectionStrategy} from '@angular/core'; -import {Store, select} from '@ngrx/store'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; +import {select, Store} from '@ngrx/store'; import {Subject} from 'rxjs'; -import {takeUntil, distinctUntilChanged} from 'rxjs/operators'; - +import {distinctUntilChanged, takeUntil} from 'rxjs/operators'; +import '../../tb_polymer_interop_types'; import {getPageSize} from '../_redux/settings_selectors'; import {State} from '../_redux/settings_types'; diff --git a/tensorboard/webapp/settings/_views/polymer_interop_test.ts b/tensorboard/webapp/settings/_views/polymer_interop_test.ts index 98da2368c3..264adf05c6 100644 --- a/tensorboard/webapp/settings/_views/polymer_interop_test.ts +++ b/tensorboard/webapp/settings/_views/polymer_interop_test.ts @@ -13,14 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {DebugElement} from '@angular/core'; -import {TestBed, fakeAsync, tick} from '@angular/core/testing'; +import {TestBed} from '@angular/core/testing'; import {Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - -import {SettingsPolymerInteropContainer} from './polymer_interop_container'; - +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {getPageSize} from '../_redux/settings_selectors'; +import {SettingsPolymerInteropContainer} from './polymer_interop_container'; describe('settings polymer_interop', () => { let store: MockStore; diff --git a/tensorboard/webapp/settings/_views/settings_button_component.ts b/tensorboard/webapp/settings/_views/settings_button_component.ts index c42662ad46..f403b2cc27 100644 --- a/tensorboard/webapp/settings/_views/settings_button_component.ts +++ b/tensorboard/webapp/settings/_views/settings_button_component.ts @@ -15,7 +15,6 @@ limitations under the License. import {Component, Input} from '@angular/core'; import {MatDialog} from '@angular/material/dialog'; import {DataLoadState} from '../../types/data'; - import {SettingsDialogContainer} from './settings_dialog_container'; @Component({ diff --git a/tensorboard/webapp/settings/_views/settings_button_container.ts b/tensorboard/webapp/settings/_views/settings_button_container.ts index af9b49f789..4c94232419 100644 --- a/tensorboard/webapp/settings/_views/settings_button_container.ts +++ b/tensorboard/webapp/settings/_views/settings_button_container.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {Component} from '@angular/core'; import {Store} from '@ngrx/store'; - import {getSettingsLoadState} from '../_redux/settings_selectors'; import {State} from '../_redux/settings_types'; diff --git a/tensorboard/webapp/settings/_views/settings_dialog_component.ts b/tensorboard/webapp/settings/_views/settings_dialog_component.ts index eebfb2bdb9..9de73c4ca1 100644 --- a/tensorboard/webapp/settings/_views/settings_dialog_component.ts +++ b/tensorboard/webapp/settings/_views/settings_dialog_component.ts @@ -14,23 +14,22 @@ limitations under the License. ==============================================================================*/ import { Component, - OnInit, - OnDestroy, - SimpleChanges, - OnChanges, EventEmitter, Input, + OnChanges, + OnDestroy, + OnInit, Output, + SimpleChanges, } from '@angular/core'; import { - FormControl, - Validators, AbstractControl, + FormControl, ValidatorFn, + Validators, } from '@angular/forms'; import {Subject} from 'rxjs'; -import {takeUntil, debounceTime, filter} from 'rxjs/operators'; - +import {debounceTime, filter, takeUntil} from 'rxjs/operators'; import {MIN_RELOAD_PERIOD_IN_MS} from '../_redux/settings_reducers'; export function createIntegerValidator(): ValidatorFn { diff --git a/tensorboard/webapp/settings/_views/settings_dialog_container.ts b/tensorboard/webapp/settings/_views/settings_dialog_container.ts index 239bd28dad..2bed7c47df 100644 --- a/tensorboard/webapp/settings/_views/settings_dialog_container.ts +++ b/tensorboard/webapp/settings/_views/settings_dialog_container.ts @@ -14,18 +14,17 @@ limitations under the License. ==============================================================================*/ import {Component} from '@angular/core'; import {Store} from '@ngrx/store'; - import { + changePageSize, + changeReloadPeriod, + toggleReloadEnabled, +} from '../_redux/settings_actions'; +import { + getPageSize, getReloadEnabled, getReloadPeriodInMs, - getPageSize, } from '../_redux/settings_selectors'; import {State} from '../_redux/settings_types'; -import { - toggleReloadEnabled, - changeReloadPeriod, - changePageSize, -} from '../_redux/settings_actions'; @Component({ selector: 'settings-dialog', diff --git a/tensorboard/webapp/settings/_views/settings_module.ts b/tensorboard/webapp/settings/_views/settings_module.ts index 61ceae6001..3f4119d57d 100644 --- a/tensorboard/webapp/settings/_views/settings_module.ts +++ b/tensorboard/webapp/settings/_views/settings_module.ts @@ -12,20 +12,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {MatButtonModule} from '@angular/material/button'; import {MatCheckboxModule} from '@angular/material/checkbox'; import {MatDialogModule} from '@angular/material/dialog'; import {MatIconModule} from '@angular/material/icon'; import {MatInputModule} from '@angular/material/input'; - +import {SettingsPolymerInteropContainer} from './polymer_interop_container'; import {SettingsButtonComponent} from './settings_button_component'; import {SettingsButtonContainer} from './settings_button_container'; import {SettingsDialogComponent} from './settings_dialog_component'; import {SettingsDialogContainer} from './settings_dialog_container'; -import {SettingsPolymerInteropContainer} from './polymer_interop_container'; @NgModule({ declarations: [ diff --git a/tensorboard/webapp/settings/_views/settings_test.ts b/tensorboard/webapp/settings/_views/settings_test.ts index af492bf14b..429a1cec0b 100644 --- a/tensorboard/webapp/settings/_views/settings_test.ts +++ b/tensorboard/webapp/settings/_views/settings_test.ts @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {OverlayContainer} from '@angular/cdk/overlay'; -import {TestBed, tick, fakeAsync} from '@angular/core/testing'; +import {fakeAsync, TestBed, tick} from '@angular/core/testing'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {MatButtonModule} from '@angular/material/button'; import {MatCheckboxModule} from '@angular/material/checkbox'; @@ -23,22 +23,19 @@ import {By} from '@angular/platform-browser'; import {BrowserDynamicTestingModule} from '@angular/platform-browser-dynamic/testing'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - -import {SettingsButtonComponent} from './settings_button_component'; -import {SettingsButtonContainer} from './settings_button_container'; -import {SettingsDialogComponent} from './settings_dialog_component'; -import {SettingsDialogContainer} from './settings_dialog_container'; - +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {MatIconTestingModule} from '../../testing/mat_icon_module'; +import {DataLoadState} from '../../types/data'; +import {createSettings, createSettingsState, createState} from '../testing'; import { - toggleReloadEnabled, changeReloadPeriod, + toggleReloadEnabled, } from '../_redux/settings_actions'; -import {createSettings, createSettingsState, createState} from '../testing'; - import {getSettingsLoadState} from '../_redux/settings_selectors'; -import {DataLoadState} from '../../types/data'; +import {SettingsButtonComponent} from './settings_button_component'; +import {SettingsButtonContainer} from './settings_button_container'; +import {SettingsDialogComponent} from './settings_dialog_component'; +import {SettingsDialogContainer} from './settings_dialog_container'; describe('settings test', () => { let store: MockStore; diff --git a/tensorboard/webapp/settings/settings_module.ts b/tensorboard/webapp/settings/settings_module.ts index ed5ad1cddc..3416446b73 100644 --- a/tensorboard/webapp/settings/settings_module.ts +++ b/tensorboard/webapp/settings/settings_module.ts @@ -14,19 +14,18 @@ limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; import {createSelector, StoreModule} from '@ngrx/store'; - -import {SettingsModule as ViewModule} from './_views/settings_module'; -import {reducers} from './_redux/settings_reducers'; -import {SETTINGS_FEATURE_KEY, State} from './_redux/settings_types'; import { PersistableSettings, PersistentSettingsConfigModule, } from '../persistent_settings'; +import {reducers} from './_redux/settings_reducers'; import { getPageSize, getReloadEnabled, getReloadPeriodInMs, } from './_redux/settings_selectors'; +import {SETTINGS_FEATURE_KEY, State} from './_redux/settings_types'; +import {SettingsModule as ViewModule} from './_views/settings_module'; export function createAutoReloadSettingSelector() { return createSelector(getReloadEnabled, (autoReload) => { diff --git a/tensorboard/webapp/settings/testing.ts b/tensorboard/webapp/settings/testing.ts index 0b8df5dc7e..34d4021fd3 100644 --- a/tensorboard/webapp/settings/testing.ts +++ b/tensorboard/webapp/settings/testing.ts @@ -17,8 +17,8 @@ import {ColorPalette, DEFAULT_PALETTE} from '../util/colors'; import { Settings, SettingsState, - State, SETTINGS_FEATURE_KEY, + State, } from './_redux/settings_types'; export function createSettings(override?: Partial) { diff --git a/tensorboard/webapp/store_module.ts b/tensorboard/webapp/store_module.ts index 3521919289..caafc4fde1 100644 --- a/tensorboard/webapp/store_module.ts +++ b/tensorboard/webapp/store_module.ts @@ -15,7 +15,6 @@ limitations under the License. import {NgModule} from '@angular/core'; import {EffectsModule as NgrxEffectsModule} from '@ngrx/effects'; import {META_REDUCERS, StoreModule as NgrxStoreModule} from '@ngrx/store'; - import {loggerMetaReducerFactory, ROOT_REDUCERS} from './reducer_config'; @NgModule({ diff --git a/tensorboard/webapp/tb_wrapper/tb_wrapper_module.ts b/tensorboard/webapp/tb_wrapper/tb_wrapper_module.ts index 203909a133..0d16b88d1d 100644 --- a/tensorboard/webapp/tb_wrapper/tb_wrapper_module.ts +++ b/tensorboard/webapp/tb_wrapper/tb_wrapper_module.ts @@ -12,9 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; - +import {NgModule} from '@angular/core'; import {PluginsModule} from '../plugins/plugins_module'; import {ReloaderModule} from '../reloader/reloader_module'; import {TensorBoardWrapperComponent} from './tb_wrapper_component'; diff --git a/tensorboard/webapp/tbdev_upload/tbdev_upload_button_component.ts b/tensorboard/webapp/tbdev_upload/tbdev_upload_button_component.ts index e92ec76bcd..d2859d5f50 100644 --- a/tensorboard/webapp/tbdev_upload/tbdev_upload_button_component.ts +++ b/tensorboard/webapp/tbdev_upload/tbdev_upload_button_component.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {Component, HostBinding, Inject} from '@angular/core'; import {MatDialog} from '@angular/material/dialog'; - import {TbdevUploadDialogContainer} from './tbdev_upload_dialog_container'; // A list of hostname values that will trigger the button to appear. diff --git a/tensorboard/webapp/tbdev_upload/tbdev_upload_dialog_container.ts b/tensorboard/webapp/tbdev_upload/tbdev_upload_dialog_container.ts index 64e0cc9fda..5e4feaa12c 100644 --- a/tensorboard/webapp/tbdev_upload/tbdev_upload_dialog_container.ts +++ b/tensorboard/webapp/tbdev_upload/tbdev_upload_dialog_container.ts @@ -13,8 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Component} from '@angular/core'; -import {Store, select, createSelector} from '@ngrx/store'; - +import {createSelector, select, Store} from '@ngrx/store'; import {getEnvironment, State} from '../core/store'; const getLogdir = createSelector( diff --git a/tensorboard/webapp/tbdev_upload/tbdev_upload_module.ts b/tensorboard/webapp/tbdev_upload/tbdev_upload_module.ts index e9b3dc5bf4..4537e96f75 100644 --- a/tensorboard/webapp/tbdev_upload/tbdev_upload_module.ts +++ b/tensorboard/webapp/tbdev_upload/tbdev_upload_module.ts @@ -13,12 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {ClipboardModule} from '@angular/cdk/clipboard'; -import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; import {MatButtonModule} from '@angular/material/button'; import {MatDialogModule} from '@angular/material/dialog'; import {MatIconModule} from '@angular/material/icon'; - import {TbdevUploadButtonComponent} from './tbdev_upload_button_component'; import {TbdevUploadDialogComponent} from './tbdev_upload_dialog_component'; import {TbdevUploadDialogContainer} from './tbdev_upload_dialog_container'; diff --git a/tensorboard/webapp/tbdev_upload/tbdev_upload_test.ts b/tensorboard/webapp/tbdev_upload/tbdev_upload_test.ts index f62163e4fa..1f0bf15309 100644 --- a/tensorboard/webapp/tbdev_upload/tbdev_upload_test.ts +++ b/tensorboard/webapp/tbdev_upload/tbdev_upload_test.ts @@ -20,16 +20,14 @@ import {MatDialogModule, MatDialogRef} from '@angular/material/dialog'; import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Store} from '@ngrx/store'; -import {provideMockStore, MockStore} from '@ngrx/store/testing'; - +import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {State} from '../core/store'; +import {createCoreState, createEnvironment, createState} from '../core/testing'; +import {MatIconTestingModule} from '../testing/mat_icon_module'; import {TbdevUploadButtonComponent} from './tbdev_upload_button_component'; import {TbdevUploadDialogComponent} from './tbdev_upload_dialog_component'; import {TbdevUploadDialogContainer} from './tbdev_upload_dialog_container'; -import {createCoreState, createEnvironment, createState} from '../core/testing'; -import {MatIconTestingModule} from '../testing/mat_icon_module'; - describe('tbdev upload test', () => { let store: MockStore; const clipboardSpy = jasmine.createSpyObj('Clipboard', ['copy']); diff --git a/tensorboard/webapp/testing/integration_test_module.ts b/tensorboard/webapp/testing/integration_test_module.ts index 4134aa3d07..b60e0c5dca 100644 --- a/tensorboard/webapp/testing/integration_test_module.ts +++ b/tensorboard/webapp/testing/integration_test_module.ts @@ -17,10 +17,9 @@ limitations under the License. * * This module does not facilitate any screenshot testing. */ -import {Component, Injectable, NgModule} from '@angular/core'; +import {Component, NgModule} from '@angular/core'; import {EffectsModule as NgrxEffectsModule} from '@ngrx/effects'; import {StoreModule as NgrxStoreModule} from '@ngrx/store'; - import {AppRoutingModule} from '../app_routing/app_routing_module'; import {RouteDef} from '../app_routing/route_config_types'; import {RouteRegistryModule} from '../app_routing/route_registry_module'; diff --git a/tensorboard/webapp/util/local_storage_testing.ts b/tensorboard/webapp/util/local_storage_testing.ts index 7b7030c0a9..2a8b424ece 100644 --- a/tensorboard/webapp/util/local_storage_testing.ts +++ b/tensorboard/webapp/util/local_storage_testing.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Injectable, NgModule} from '@angular/core'; - import {LocalStorage} from './local_storage'; @Injectable() diff --git a/tensorboard/webapp/util/ngrx_test.ts b/tensorboard/webapp/util/ngrx_test.ts index 9940697c7f..5695713d38 100644 --- a/tensorboard/webapp/util/ngrx_test.ts +++ b/tensorboard/webapp/util/ngrx_test.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {createAction, createReducer, on} from '@ngrx/store'; - import {composeReducers} from './ngrx'; const incrementFoo = createAction('[UTIL TEST] Increment Foo'); diff --git a/tensorboard/webapp/util/ui_selectors.ts b/tensorboard/webapp/util/ui_selectors.ts index f27d5b7674..d15bb12299 100644 --- a/tensorboard/webapp/util/ui_selectors.ts +++ b/tensorboard/webapp/util/ui_selectors.ts @@ -26,7 +26,6 @@ limitations under the License. */ import {createSelector} from '@ngrx/store'; - import { getExperimentIdsFromRoute, getExperimentIdToExperimentAliasMap, diff --git a/tensorboard/webapp/webapp_data_source/tb_feature_flag_data_source.ts b/tensorboard/webapp/webapp_data_source/tb_feature_flag_data_source.ts index a457626c48..2f6b313333 100644 --- a/tensorboard/webapp/webapp_data_source/tb_feature_flag_data_source.ts +++ b/tensorboard/webapp/webapp_data_source/tb_feature_flag_data_source.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Injectable} from '@angular/core'; - import {FeatureFlags} from '../feature_flag/types'; +import {QueryParams} from './query_params'; import { ENABLE_CARD_WIDTH_SETTING_PARAM_KEY, ENABLE_COLOR_GROUP_BY_REGEX_QUERY_PARAM_KEY, @@ -26,7 +26,6 @@ import { SCALARS_BATCH_SIZE_PARAM_KEY, TBFeatureFlagDataSource, } from './tb_feature_flag_data_source_types'; -import {QueryParams} from './query_params'; const DARK_MODE_MEDIA_QUERY = '(prefers-color-scheme: dark)'; diff --git a/tensorboard/webapp/webapp_data_source/tb_feature_flag_data_source_test.ts b/tensorboard/webapp/webapp_data_source/tb_feature_flag_data_source_test.ts index 613dd2381b..feed77c667 100644 --- a/tensorboard/webapp/webapp_data_source/tb_feature_flag_data_source_test.ts +++ b/tensorboard/webapp/webapp_data_source/tb_feature_flag_data_source_test.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {TestBed} from '@angular/core/testing'; import {QueryParams} from './query_params'; - import { QueryParamsFeatureFlagDataSource, TEST_ONLY, diff --git a/tensorboard/webapp/webapp_data_source/tb_feature_flag_data_source_types.ts b/tensorboard/webapp/webapp_data_source/tb_feature_flag_data_source_types.ts index 6901f442fd..e6db8b4305 100644 --- a/tensorboard/webapp/webapp_data_source/tb_feature_flag_data_source_types.ts +++ b/tensorboard/webapp/webapp_data_source/tb_feature_flag_data_source_types.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Injectable} from '@angular/core'; - import {FeatureFlags} from '../feature_flag/types'; @Injectable() diff --git a/tensorboard/webapp/webapp_data_source/tb_feature_flag_module.ts b/tensorboard/webapp/webapp_data_source/tb_feature_flag_module.ts index 5502c88e58..91d3e8d065 100644 --- a/tensorboard/webapp/webapp_data_source/tb_feature_flag_module.ts +++ b/tensorboard/webapp/webapp_data_source/tb_feature_flag_module.ts @@ -14,10 +14,9 @@ limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - -import {TBFeatureFlagDataSource} from './tb_feature_flag_data_source_types'; -import {QueryParamsFeatureFlagDataSource} from './tb_feature_flag_data_source'; import {QueryParams} from './query_params'; +import {QueryParamsFeatureFlagDataSource} from './tb_feature_flag_data_source'; +import {TBFeatureFlagDataSource} from './tb_feature_flag_data_source_types'; @NgModule({ providers: [ diff --git a/tensorboard/webapp/webapp_data_source/tb_feature_flag_testing.ts b/tensorboard/webapp/webapp_data_source/tb_feature_flag_testing.ts index 652666003d..5e75c6e5a5 100644 --- a/tensorboard/webapp/webapp_data_source/tb_feature_flag_testing.ts +++ b/tensorboard/webapp/webapp_data_source/tb_feature_flag_testing.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {Injectable, NgModule} from '@angular/core'; - import {buildFeatureFlag} from '../feature_flag/testing'; import {TBFeatureFlagDataSource} from './tb_feature_flag_data_source_types'; diff --git a/tensorboard/webapp/webapp_data_source/tb_http_client.ts b/tensorboard/webapp/webapp_data_source/tb_http_client.ts index b46f0b680d..b03bf689d5 100644 --- a/tensorboard/webapp/webapp_data_source/tb_http_client.ts +++ b/tensorboard/webapp/webapp_data_source/tb_http_client.ts @@ -12,23 +12,20 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {Injectable} from '@angular/core'; import {HttpClient, HttpHeaders} from '@angular/common/http'; +import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; import {Observable} from 'rxjs'; import {filter, mergeMap, take, withLatestFrom} from 'rxjs/operators'; - import {AppRootProvider} from '../app_routing/app_root'; - -// Intentionally import directly from feature_flag/, not the hourglass -// AppState/selectors. AppState depends on code from feature directories that -// use TBHttpClient themselves, so we avoid a possible circular dependency. -import {State} from '../feature_flag/store/feature_flag_types'; import { getIsFeatureFlagsLoaded, getIsInColab, } from '../feature_flag/store/feature_flag_selectors'; - +// Intentionally import directly from feature_flag/, not the hourglass +// AppState/selectors. AppState depends on code from feature directories that +// use TBHttpClient themselves, so we avoid a possible circular dependency. +import {State} from '../feature_flag/store/feature_flag_types'; import { DeleteOptions, GetOptions, diff --git a/tensorboard/webapp/webapp_data_source/tb_http_client_module.ts b/tensorboard/webapp/webapp_data_source/tb_http_client_module.ts index 19a6f0118e..cf34dd714e 100644 --- a/tensorboard/webapp/webapp_data_source/tb_http_client_module.ts +++ b/tensorboard/webapp/webapp_data_source/tb_http_client_module.ts @@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {NgModule} from '@angular/core'; import {HttpClientModule} from '@angular/common/http'; +import {NgModule} from '@angular/core'; import {AppRootModule} from '../app_routing/app_root_module'; import {TBHttpClient} from './tb_http_client'; diff --git a/tensorboard/webapp/webapp_data_source/tb_http_client_test.ts b/tensorboard/webapp/webapp_data_source/tb_http_client_test.ts index 9553d7622b..5f33d11262 100644 --- a/tensorboard/webapp/webapp_data_source/tb_http_client_test.ts +++ b/tensorboard/webapp/webapp_data_source/tb_http_client_test.ts @@ -16,22 +16,21 @@ import {HttpHeaders} from '@angular/common/http'; import {TestBed} from '@angular/core/testing'; import {Store} from '@ngrx/store'; import {MockStore} from '@ngrx/store/testing'; - import { AppRootProvider, TestableAppRootProvider, } from '../app_routing/app_root'; -import {State} from '../feature_flag/store/feature_flag_types'; import { getIsFeatureFlagsLoaded, getIsInColab, } from '../feature_flag/store/feature_flag_selectors'; +import {State} from '../feature_flag/store/feature_flag_types'; import {TBFeatureFlagTestingModule} from './tb_feature_flag_testing'; +import {TBHttpClient, XSRF_REQUIRED_HEADER} from './tb_http_client'; import { HttpTestingController, TBHttpClientTestingModule, } from './tb_http_client_testing'; -import {TBHttpClient, XSRF_REQUIRED_HEADER} from './tb_http_client'; describe('TBHttpClient', () => { let tbHttpClient: TBHttpClient; diff --git a/tensorboard/webapp/webapp_data_source/tb_http_client_testing.ts b/tensorboard/webapp/webapp_data_source/tb_http_client_testing.ts index 8bc1d926e5..0a9aa4898f 100644 --- a/tensorboard/webapp/webapp_data_source/tb_http_client_testing.ts +++ b/tensorboard/webapp/webapp_data_source/tb_http_client_testing.ts @@ -14,15 +14,13 @@ limitations under the License. ==============================================================================*/ export {HttpTestingController} from '@angular/common/http/testing'; -import {NgModule} from '@angular/core'; import {HttpClientTestingModule} from '@angular/common/http/testing'; +import {NgModule} from '@angular/core'; import {provideMockStore} from '@ngrx/store/testing'; - import { - buildState as buildFeatureFlagAppState, buildFeatureFlagState, + buildState as buildFeatureFlagAppState, } from '../feature_flag/store/testing'; - import {TBHttpClientModule} from './tb_http_client_module'; @NgModule({ diff --git a/tensorboard/webapp/webapp_data_source/tb_server_data_source.ts b/tensorboard/webapp/webapp_data_source/tb_server_data_source.ts index 20312f29fd..3a5228cbc4 100644 --- a/tensorboard/webapp/webapp_data_source/tb_server_data_source.ts +++ b/tensorboard/webapp/webapp_data_source/tb_server_data_source.ts @@ -12,15 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import '../tb_polymer_interop_types'; - import {Injectable} from '@angular/core'; -import {from, forkJoin, throwError, Observable} from 'rxjs'; +import {forkJoin, from, Observable, throwError} from 'rxjs'; import {catchError, map} from 'rxjs/operators'; - -import {Environment, PluginsListing} from '../types/api'; import {PluginsListFailureCode} from '../core/types'; - +import '../tb_polymer_interop_types'; +import {Environment, PluginsListing} from '../types/api'; import {HttpErrorResponse, TBHttpClient} from './tb_http_client'; function getPluginsListingQueryParams(enabledExperimentPluginIds: string[]) { diff --git a/tensorboard/webapp/webapp_data_source/tb_server_data_source_module.ts b/tensorboard/webapp/webapp_data_source/tb_server_data_source_module.ts index 0c8fa6f594..c4de89b604 100644 --- a/tensorboard/webapp/webapp_data_source/tb_server_data_source_module.ts +++ b/tensorboard/webapp/webapp_data_source/tb_server_data_source_module.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - import {TBHttpClientModule} from './tb_http_client_module'; import {TBServerDataSource} from './tb_server_data_source'; diff --git a/tensorboard/webapp/webapp_data_source/tb_server_data_source_test.ts b/tensorboard/webapp/webapp_data_source/tb_server_data_source_test.ts index 8e99c9e958..931dee55b9 100644 --- a/tensorboard/webapp/webapp_data_source/tb_server_data_source_test.ts +++ b/tensorboard/webapp/webapp_data_source/tb_server_data_source_test.ts @@ -13,13 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {fakeAsync, flush, TestBed} from '@angular/core/testing'; - -import {TBServerDataSource, TBServerError} from './tb_server_data_source'; +import {PluginsListFailureCode} from '../core/types'; import { - TBHttpClientTestingModule, HttpTestingController, + TBHttpClientTestingModule, } from './tb_http_client_testing'; -import {PluginsListFailureCode} from '../core/types'; +import {TBServerDataSource, TBServerError} from './tb_server_data_source'; describe('tb_server_data_source', () => { describe('TBServerDataSource', () => { diff --git a/tensorboard/webapp/widgets/content_wrapping_input/content_wrapping_input_module.ts b/tensorboard/webapp/widgets/content_wrapping_input/content_wrapping_input_module.ts index 36e0b2af8b..6d4242a3fe 100644 --- a/tensorboard/webapp/widgets/content_wrapping_input/content_wrapping_input_module.ts +++ b/tensorboard/webapp/widgets/content_wrapping_input/content_wrapping_input_module.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - import {ContentWrappingInputComponent} from './content_wrapping_input_component'; /** diff --git a/tensorboard/webapp/widgets/content_wrapping_input/content_wrapping_input_test.ts b/tensorboard/webapp/widgets/content_wrapping_input/content_wrapping_input_test.ts index 918e17706a..964cfc35f8 100644 --- a/tensorboard/webapp/widgets/content_wrapping_input/content_wrapping_input_test.ts +++ b/tensorboard/webapp/widgets/content_wrapping_input/content_wrapping_input_test.ts @@ -16,7 +16,6 @@ limitations under the License. import {Component, Input} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {KeyType, sendKey} from '../../testing/dom'; import {ContentWrappingInputComponent} from './content_wrapping_input_component'; diff --git a/tensorboard/webapp/widgets/dropdown/dropdown_module.ts b/tensorboard/webapp/widgets/dropdown/dropdown_module.ts index 9190604925..3e5e3236c3 100644 --- a/tensorboard/webapp/widgets/dropdown/dropdown_module.ts +++ b/tensorboard/webapp/widgets/dropdown/dropdown_module.ts @@ -15,7 +15,6 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {MatSelectModule} from '@angular/material/select'; - import {DropdownComponent} from './dropdown_component'; @NgModule({ diff --git a/tensorboard/webapp/widgets/experiment_alias/experiment_alias_component.ts b/tensorboard/webapp/widgets/experiment_alias/experiment_alias_component.ts index 285911e78b..6d516ec3f4 100644 --- a/tensorboard/webapp/widgets/experiment_alias/experiment_alias_component.ts +++ b/tensorboard/webapp/widgets/experiment_alias/experiment_alias_component.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {Component, EventEmitter, Input, Output} from '@angular/core'; - import {ExperimentAlias} from '../../experiments/types'; /** diff --git a/tensorboard/webapp/widgets/experiment_alias/experiment_alias_module.ts b/tensorboard/webapp/widgets/experiment_alias/experiment_alias_module.ts index 78ff05e083..00ac06525f 100644 --- a/tensorboard/webapp/widgets/experiment_alias/experiment_alias_module.ts +++ b/tensorboard/webapp/widgets/experiment_alias/experiment_alias_module.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {ContentWrappingInputModule} from '../content_wrapping_input/content_wrapping_input_module'; import {ExperimentAliasComponent} from './experiment_alias_component'; diff --git a/tensorboard/webapp/widgets/experiment_alias/experiment_alias_test.ts b/tensorboard/webapp/widgets/experiment_alias/experiment_alias_test.ts index 07a32831a8..0699ab49aa 100644 --- a/tensorboard/webapp/widgets/experiment_alias/experiment_alias_test.ts +++ b/tensorboard/webapp/widgets/experiment_alias/experiment_alias_test.ts @@ -15,7 +15,6 @@ limitations under the License. import {Component, Input} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {ExperimentAlias} from '../../experiments/types'; import {sendKeys} from '../../testing/dom'; import {ContentWrappingInputModule} from '../content_wrapping_input/content_wrapping_input_module'; diff --git a/tensorboard/webapp/widgets/filter_input/filter_input_module.ts b/tensorboard/webapp/widgets/filter_input/filter_input_module.ts index a210c1eaac..c5d9252703 100644 --- a/tensorboard/webapp/widgets/filter_input/filter_input_module.ts +++ b/tensorboard/webapp/widgets/filter_input/filter_input_module.ts @@ -16,7 +16,6 @@ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {MatAutocompleteModule} from '@angular/material/autocomplete'; import {MatIconModule} from '@angular/material/icon'; - import {FilterInputComponent} from './filter_input_component'; @NgModule({ diff --git a/tensorboard/webapp/widgets/filter_input/filter_input_test.ts b/tensorboard/webapp/widgets/filter_input/filter_input_test.ts index 85f758d55f..9a5125a96d 100644 --- a/tensorboard/webapp/widgets/filter_input/filter_input_test.ts +++ b/tensorboard/webapp/widgets/filter_input/filter_input_test.ts @@ -18,11 +18,9 @@ import {TestBed} from '@angular/core/testing'; import {MatAutocompleteModule} from '@angular/material/autocomplete'; import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; - import {KeyType, sendKey} from '../../testing/dom'; -import {MatIconTestingModule} from '../../testing/mat_icon_module'; import {getAutocompleteOptions} from '../../testing/material'; - +import {MatIconTestingModule} from '../../testing/mat_icon_module'; import {FilterInputModule} from './filter_input_module'; @Component({ diff --git a/tensorboard/webapp/widgets/histogram/histogram_component.ts b/tensorboard/webapp/widgets/histogram/histogram_component.ts index 59c1fc3608..f71af7805c 100644 --- a/tensorboard/webapp/widgets/histogram/histogram_component.ts +++ b/tensorboard/webapp/widgets/histogram/histogram_component.ts @@ -25,7 +25,6 @@ import { } from '@angular/core'; import {fromEvent, Subject} from 'rxjs'; import {takeUntil} from 'rxjs/operators'; - import * as d3 from '../../third_party/d3'; import {HCLColor} from '../../third_party/d3'; import { diff --git a/tensorboard/webapp/widgets/histogram/histogram_module.ts b/tensorboard/webapp/widgets/histogram/histogram_module.ts index bf7959ac26..0e257eb94f 100644 --- a/tensorboard/webapp/widgets/histogram/histogram_module.ts +++ b/tensorboard/webapp/widgets/histogram/histogram_module.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {IntersectionObserverModule} from '../intersection_observer/intersection_observer_module'; import {LinkedTimeFobModule} from '../linked_time_fob/linked_time_fob_module'; import {ResizeDetectorModule} from '../resize_detector_module'; diff --git a/tensorboard/webapp/widgets/histogram/histogram_test.ts b/tensorboard/webapp/widgets/histogram/histogram_test.ts index c12c47b668..48f05effe6 100644 --- a/tensorboard/webapp/widgets/histogram/histogram_test.ts +++ b/tensorboard/webapp/widgets/histogram/histogram_test.ts @@ -22,7 +22,6 @@ import { import {ComponentFixture, TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; - import {IntersectionObserverTestingModule} from '../intersection_observer/intersection_observer_testing_module'; import {LinkedTimeFobModule} from '../linked_time_fob/linked_time_fob_module'; import {HistogramComponent, TooltipData} from './histogram_component'; diff --git a/tensorboard/webapp/widgets/intersection_observer/intersection_observer_module.ts b/tensorboard/webapp/widgets/intersection_observer/intersection_observer_module.ts index 5ebd8a8228..1ed63f992a 100644 --- a/tensorboard/webapp/widgets/intersection_observer/intersection_observer_module.ts +++ b/tensorboard/webapp/widgets/intersection_observer/intersection_observer_module.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - import {IntersectionObserverDirective} from './intersection_observer_directive'; @NgModule({ diff --git a/tensorboard/webapp/widgets/intersection_observer/intersection_observer_test.ts b/tensorboard/webapp/widgets/intersection_observer/intersection_observer_test.ts index fb6cac203c..80c722263b 100644 --- a/tensorboard/webapp/widgets/intersection_observer/intersection_observer_test.ts +++ b/tensorboard/webapp/widgets/intersection_observer/intersection_observer_test.ts @@ -16,7 +16,6 @@ limitations under the License. import {ScrollingModule} from '@angular/cdk/scrolling'; import {Component, ElementRef, Input, ViewChild} from '@angular/core'; import {TestBed} from '@angular/core/testing'; - import {IntersectionObserverDirective} from './intersection_observer_directive'; @Component({ diff --git a/tensorboard/webapp/widgets/line_chart_v2/lib/coordinator_test.ts b/tensorboard/webapp/widgets/line_chart_v2/lib/coordinator_test.ts index 34d9b40f43..d5c7805041 100644 --- a/tensorboard/webapp/widgets/line_chart_v2/lib/coordinator_test.ts +++ b/tensorboard/webapp/widgets/line_chart_v2/lib/coordinator_test.ts @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {ScaleType} from './scale_types'; -import {createScale} from './scale'; import {Coordinator} from './coordinator'; +import {createScale} from './scale'; +import {ScaleType} from './scale_types'; import {ThreeCoordinator} from './threejs_coordinator'; describe('line_chart_v2/lib/coordinator test', () => { diff --git a/tensorboard/webapp/widgets/line_chart_v2/lib/formatter_test.ts b/tensorboard/webapp/widgets/line_chart_v2/lib/formatter_test.ts index 85bf48e05c..206bf687f4 100644 --- a/tensorboard/webapp/widgets/line_chart_v2/lib/formatter_test.ts +++ b/tensorboard/webapp/widgets/line_chart_v2/lib/formatter_test.ts @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import { + intlNumberFormatter, numberFormatter, relativeTimeFormatter, - intlNumberFormatter, siNumberFormatter, TEST_ONLY, wallTimeFormatter, diff --git a/tensorboard/webapp/widgets/line_chart_v2/lib/renderer/renderer_test.ts b/tensorboard/webapp/widgets/line_chart_v2/lib/renderer/renderer_test.ts index 1b4626d148..93c05acfde 100644 --- a/tensorboard/webapp/widgets/line_chart_v2/lib/renderer/renderer_test.ts +++ b/tensorboard/webapp/widgets/line_chart_v2/lib/renderer/renderer_test.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import * as THREE from 'three'; - import {Polyline} from '../internal_types'; import {assertSvgPathD} from '../testing'; import {ThreeCoordinator} from '../threejs_coordinator'; diff --git a/tensorboard/webapp/widgets/line_chart_v2/lib/renderer/threejs_renderer.ts b/tensorboard/webapp/widgets/line_chart_v2/lib/renderer/threejs_renderer.ts index d9a4e6ffeb..99991b7115 100644 --- a/tensorboard/webapp/widgets/line_chart_v2/lib/renderer/threejs_renderer.ts +++ b/tensorboard/webapp/widgets/line_chart_v2/lib/renderer/threejs_renderer.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import * as THREE from 'three'; - import {hsl, interpolateHsl} from '../../../../third_party/d3'; import {Point, Polyline, Rect} from '../internal_types'; import {ThreeCoordinator} from '../threejs_coordinator'; diff --git a/tensorboard/webapp/widgets/line_chart_v2/lib/threejs_coordinator.ts b/tensorboard/webapp/widgets/line_chart_v2/lib/threejs_coordinator.ts index e4bd597b75..eb984bdd02 100644 --- a/tensorboard/webapp/widgets/line_chart_v2/lib/threejs_coordinator.ts +++ b/tensorboard/webapp/widgets/line_chart_v2/lib/threejs_coordinator.ts @@ -14,10 +14,8 @@ limitations under the License. ==============================================================================*/ import * as THREE from 'three'; - import {Coordinator} from './coordinator'; import {Rect} from './internal_types'; -import {convertRectToExtent} from './utils'; /** * Unlike Coordinator, ThreeCoordinator uses internal coordinate system. diff --git a/tensorboard/webapp/widgets/line_chart_v2/lib/worker/worker_chart.ts b/tensorboard/webapp/widgets/line_chart_v2/lib/worker/worker_chart.ts index c9df221b23..6b34b35f84 100644 --- a/tensorboard/webapp/widgets/line_chart_v2/lib/worker/worker_chart.ts +++ b/tensorboard/webapp/widgets/line_chart_v2/lib/worker/worker_chart.ts @@ -26,8 +26,8 @@ import { GuestToMainMessage, GuestToMainType, HostToGuestEvent, - InitMessage, HostToGuestMessage, + InitMessage, RendererType, } from './message_types'; import {WorkerPool, WorkerProxy} from './worker_pool'; diff --git a/tensorboard/webapp/widgets/line_chart_v2/lib/worker/worker_chart_bridge.ts b/tensorboard/webapp/widgets/line_chart_v2/lib/worker/worker_chart_bridge.ts index 2a8f4abf3d..0b00b93fe2 100644 --- a/tensorboard/webapp/widgets/line_chart_v2/lib/worker/worker_chart_bridge.ts +++ b/tensorboard/webapp/widgets/line_chart_v2/lib/worker/worker_chart_bridge.ts @@ -19,8 +19,8 @@ import {decompactDataSeries} from './compact_data_series'; import { GuestToMainType, HostToGuestEvent, - InitMessage, HostToGuestMessage, + InitMessage, RendererType, } from './message_types'; diff --git a/tensorboard/webapp/widgets/line_chart_v2/line_chart_component.ts b/tensorboard/webapp/widgets/line_chart_v2/line_chart_component.ts index f962280657..5dc033e54e 100644 --- a/tensorboard/webapp/widgets/line_chart_v2/line_chart_component.ts +++ b/tensorboard/webapp/widgets/line_chart_v2/line_chart_component.ts @@ -18,18 +18,15 @@ import { ChangeDetectorRef, Component, ElementRef, - EventEmitter, Input, OnChanges, OnDestroy, OnInit, - Output, SimpleChanges, TemplateRef, ViewChild, } from '@angular/core'; import {Observable, ReplaySubject} from 'rxjs'; - import {ChartImpl} from './lib/chart'; import {Chart} from './lib/chart_types'; import { diff --git a/tensorboard/webapp/widgets/line_chart_v2/line_chart_component_test.ts b/tensorboard/webapp/widgets/line_chart_v2/line_chart_component_test.ts index 1676dafe22..b84ad4d47f 100644 --- a/tensorboard/webapp/widgets/line_chart_v2/line_chart_component_test.ts +++ b/tensorboard/webapp/widgets/line_chart_v2/line_chart_component_test.ts @@ -18,7 +18,6 @@ import {CommonModule} from '@angular/common'; import {Component, Input, NO_ERRORS_SCHEMA, ViewChild} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {ChartImpl} from './lib/chart'; import { Chart, diff --git a/tensorboard/webapp/widgets/line_chart_v2/line_chart_internal_utils_test.ts b/tensorboard/webapp/widgets/line_chart_v2/line_chart_internal_utils_test.ts index 472d8b5f5e..31637d3397 100644 --- a/tensorboard/webapp/widgets/line_chart_v2/line_chart_internal_utils_test.ts +++ b/tensorboard/webapp/widgets/line_chart_v2/line_chart_internal_utils_test.ts @@ -13,14 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +import {RendererType, ScaleType} from './lib/public_types'; +import {createScale} from './lib/scale'; +import {buildMetadata, buildSeries} from './lib/testing'; +import * as libUtils from './lib/utils'; import { computeDataSeriesExtent, getRendererType, } from './line_chart_internal_utils'; -import * as libUtils from './lib/utils'; -import {RendererType, ScaleType} from './lib/public_types'; -import {buildSeries, buildMetadata} from './lib/testing'; -import {createScale} from './lib/scale'; function isFinite(x: number): boolean { return Number.isFinite(x); diff --git a/tensorboard/webapp/widgets/line_chart_v2/line_chart_module.ts b/tensorboard/webapp/widgets/line_chart_v2/line_chart_module.ts index c187b811c0..cf36a9b11b 100644 --- a/tensorboard/webapp/widgets/line_chart_v2/line_chart_module.ts +++ b/tensorboard/webapp/widgets/line_chart_v2/line_chart_module.ts @@ -12,13 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -import {NgModule} from '@angular/core'; -import {CommonModule} from '@angular/common'; import {OverlayModule} from '@angular/cdk/overlay'; - +import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; +import {ResizeDetectorModule} from '../resize_detector_module'; import {LineChartComponent} from './line_chart_component'; import {SubViewModule} from './sub_view/sub_view_module'; -import {ResizeDetectorModule} from '../resize_detector_module'; @NgModule({ declarations: [LineChartComponent], diff --git a/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_axis_view_test.ts b/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_axis_view_test.ts index 5840a4ed32..3e8effd2eb 100644 --- a/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_axis_view_test.ts +++ b/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_axis_view_test.ts @@ -23,12 +23,11 @@ import {MatMenuModule} from '@angular/material/menu'; import {MatMenuHarness} from '@angular/material/menu/testing'; import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; - import {MatIconTestingModule} from '../../../testing/mat_icon_module'; import {Extent, Scale, ScaleType} from '../lib/public_types'; import {createScale} from '../lib/scale'; -import {LineChartAxisComponent} from './line_chart_axis_view'; import * as utils from './line_chart_axis_utils'; +import {LineChartAxisComponent} from './line_chart_axis_view'; @Component({ selector: 'testable-comp', diff --git a/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_grid_view.ts b/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_grid_view.ts index b1bd292d2d..db5789ae73 100644 --- a/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_grid_view.ts +++ b/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_grid_view.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; - import {Extent, Scale} from '../lib/public_types'; import { getDomSizeInformedTickCount, diff --git a/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_grid_view_test.ts b/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_grid_view_test.ts index d1fceab4f5..2f5e83fc7a 100644 --- a/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_grid_view_test.ts +++ b/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_grid_view_test.ts @@ -16,9 +16,8 @@ limitations under the License. import {Component, DebugElement, Input} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - -import {createScale} from '../lib/scale'; import {Extent, ScaleType} from '../lib/public_types'; +import {createScale} from '../lib/scale'; import {LineChartGridView} from './line_chart_grid_view'; @Component({ diff --git a/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_interactive_view.ts b/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_interactive_view.ts index 791f5e7f96..73fa6fba15 100644 --- a/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_interactive_view.ts +++ b/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_interactive_view.ts @@ -35,7 +35,6 @@ import { } from '@angular/core'; import {fromEvent, of, Subject, timer} from 'rxjs'; import {filter, map, switchMap, takeUntil, tap} from 'rxjs/operators'; - import {MouseEventButtons} from '../../../util/dom'; import { DataSeries, diff --git a/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_interactive_view_test.ts b/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_interactive_view_test.ts index b16a3d478e..db2eac69c1 100644 --- a/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_interactive_view_test.ts +++ b/tensorboard/webapp/widgets/line_chart_v2/sub_view/line_chart_interactive_view_test.ts @@ -17,7 +17,6 @@ import {CommonModule} from '@angular/common'; import {Component, Input} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import { DataSeries, DataSeriesMetadataMap, diff --git a/tensorboard/webapp/widgets/line_chart_v2/sub_view/sub_view_module.ts b/tensorboard/webapp/widgets/line_chart_v2/sub_view/sub_view_module.ts index dc487f8e16..94d3ccce2b 100644 --- a/tensorboard/webapp/widgets/line_chart_v2/sub_view/sub_view_module.ts +++ b/tensorboard/webapp/widgets/line_chart_v2/sub_view/sub_view_module.ts @@ -19,7 +19,6 @@ import {MatButtonModule} from '@angular/material/button'; import {MatIconModule} from '@angular/material/icon'; import {MatInputModule} from '@angular/material/input'; import {MatMenuModule} from '@angular/material/menu'; - import {LineChartAxisComponent} from './line_chart_axis_view'; import {LineChartGridView} from './line_chart_grid_view'; import {LineChartInteractiveViewComponent} from './line_chart_interactive_view'; diff --git a/tensorboard/webapp/widgets/linked_time_fob/linked_time_fob_module.ts b/tensorboard/webapp/widgets/linked_time_fob/linked_time_fob_module.ts index 07f99369d2..f50b25a1be 100644 --- a/tensorboard/webapp/widgets/linked_time_fob/linked_time_fob_module.ts +++ b/tensorboard/webapp/widgets/linked_time_fob/linked_time_fob_module.ts @@ -15,7 +15,6 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {LinkedTimeFobComponent} from './linked_time_fob_component'; @NgModule({ diff --git a/tensorboard/webapp/widgets/markdown_renderer/markdown_renderer_component_test.ts b/tensorboard/webapp/widgets/markdown_renderer/markdown_renderer_component_test.ts index e484da56ac..6c1b34f06f 100644 --- a/tensorboard/webapp/widgets/markdown_renderer/markdown_renderer_component_test.ts +++ b/tensorboard/webapp/widgets/markdown_renderer/markdown_renderer_component_test.ts @@ -16,12 +16,11 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {Component, Input, NO_ERRORS_SCHEMA, ViewChild} from '@angular/core'; import { + ComponentFixture, fakeAsync, flush, - ComponentFixture, TestBed, } from '@angular/core/testing'; - import {MarkdownRendererComponent} from './markdown_renderer_component'; @Component({ diff --git a/tensorboard/webapp/widgets/markdown_renderer/markdown_renderer_module.ts b/tensorboard/webapp/widgets/markdown_renderer/markdown_renderer_module.ts index 846c0c1329..f845c22c86 100644 --- a/tensorboard/webapp/widgets/markdown_renderer/markdown_renderer_module.ts +++ b/tensorboard/webapp/widgets/markdown_renderer/markdown_renderer_module.ts @@ -15,7 +15,6 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {MarkdownRendererComponent} from './markdown_renderer_component'; @NgModule({ diff --git a/tensorboard/webapp/widgets/range_input/range_input_module.ts b/tensorboard/webapp/widgets/range_input/range_input_module.ts index 62b1144b0e..bb874c6831 100644 --- a/tensorboard/webapp/widgets/range_input/range_input_module.ts +++ b/tensorboard/webapp/widgets/range_input/range_input_module.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {RangeInputComponent} from './range_input_component'; @NgModule({ diff --git a/tensorboard/webapp/widgets/range_input/range_input_test.ts b/tensorboard/webapp/widgets/range_input/range_input_test.ts index 1ac8c46c06..59c159a9cb 100644 --- a/tensorboard/webapp/widgets/range_input/range_input_test.ts +++ b/tensorboard/webapp/widgets/range_input/range_input_test.ts @@ -16,7 +16,6 @@ limitations under the License. import {Component, Input} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {RangeInputComponent, TEST_ONLY} from './range_input_component'; @Component({ diff --git a/tensorboard/webapp/widgets/resize_detector_module.ts b/tensorboard/webapp/widgets/resize_detector_module.ts index d272254838..48b025ddef 100644 --- a/tensorboard/webapp/widgets/resize_detector_module.ts +++ b/tensorboard/webapp/widgets/resize_detector_module.ts @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ import {NgModule} from '@angular/core'; - import {ResizeDetectorDirective} from './resize_detector_directive'; @NgModule({ diff --git a/tensorboard/webapp/widgets/resize_detector_test.ts b/tensorboard/webapp/widgets/resize_detector_test.ts index c3cb536ef5..485fd97c07 100644 --- a/tensorboard/webapp/widgets/resize_detector_test.ts +++ b/tensorboard/webapp/widgets/resize_detector_test.ts @@ -15,7 +15,6 @@ limitations under the License. import {Component, Input} from '@angular/core'; import {fakeAsync, TestBed, tick} from '@angular/core/testing'; - import {ResizeDetectorDirective} from './resize_detector_directive'; @Component({ diff --git a/tensorboard/webapp/widgets/source_code/source_code_component.ts b/tensorboard/webapp/widgets/source_code/source_code_component.ts index 8b1fe39a84..5de1ce8f35 100644 --- a/tensorboard/webapp/widgets/source_code/source_code_component.ts +++ b/tensorboard/webapp/widgets/source_code/source_code_component.ts @@ -21,7 +21,6 @@ import { SimpleChanges, ViewChild, } from '@angular/core'; - import { DEFAULT_CODE_FONT_SIZE, DEFAULT_CODE_LANGUAGE, diff --git a/tensorboard/webapp/widgets/source_code/source_code_container.ts b/tensorboard/webapp/widgets/source_code/source_code_container.ts index 710ae2b759..9f372066f7 100644 --- a/tensorboard/webapp/widgets/source_code/source_code_container.ts +++ b/tensorboard/webapp/widgets/source_code/source_code_container.ts @@ -15,7 +15,6 @@ limitations under the License. import {Component, Input, OnInit} from '@angular/core'; import {from, Observable} from 'rxjs'; import {map} from 'rxjs/operators'; - import {loadMonaco} from './load_monaco_shim'; /** diff --git a/tensorboard/webapp/widgets/source_code/source_code_container_test.ts b/tensorboard/webapp/widgets/source_code/source_code_container_test.ts index 13ee1b4bc3..6c0355d14c 100644 --- a/tensorboard/webapp/widgets/source_code/source_code_container_test.ts +++ b/tensorboard/webapp/widgets/source_code/source_code_container_test.ts @@ -17,7 +17,6 @@ limitations under the License. */ import {Component, Input, NO_ERRORS_SCHEMA} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; - import * as loadMonacoShim from './load_monaco_shim'; import {SourceCodeComponent} from './source_code_component'; import {SourceCodeContainer} from './source_code_container'; diff --git a/tensorboard/webapp/widgets/source_code/source_code_diff_container.ts b/tensorboard/webapp/widgets/source_code/source_code_diff_container.ts index dd01d0ce8b..81103027ad 100644 --- a/tensorboard/webapp/widgets/source_code/source_code_diff_container.ts +++ b/tensorboard/webapp/widgets/source_code/source_code_diff_container.ts @@ -15,7 +15,6 @@ limitations under the License. import {ChangeDetectionStrategy, Component, Input, OnInit} from '@angular/core'; import {from, Observable} from 'rxjs'; import {map} from 'rxjs/operators'; - import {loadMonaco} from './load_monaco_shim'; /** diff --git a/tensorboard/webapp/widgets/source_code/source_code_diff_container_test.ts b/tensorboard/webapp/widgets/source_code/source_code_diff_container_test.ts index 992c6fe6a5..70e919bf5a 100644 --- a/tensorboard/webapp/widgets/source_code/source_code_diff_container_test.ts +++ b/tensorboard/webapp/widgets/source_code/source_code_diff_container_test.ts @@ -19,7 +19,6 @@ import { NO_ERRORS_SCHEMA, } from '@angular/core'; import {TestBed} from '@angular/core/testing'; - import * as loadMonacoShim from './load_monaco_shim'; import {SourceCodeDiffComponent} from './source_code_diff_component'; import {SourceCodeDiffContainer} from './source_code_diff_container'; diff --git a/tensorboard/webapp/widgets/source_code/source_code_module.ts b/tensorboard/webapp/widgets/source_code/source_code_module.ts index ae6f3e2ffa..692a61edd8 100644 --- a/tensorboard/webapp/widgets/source_code/source_code_module.ts +++ b/tensorboard/webapp/widgets/source_code/source_code_module.ts @@ -15,7 +15,6 @@ limitations under the License. import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {ResizeDetectorModule} from '../resize_detector_module'; import {SourceCodeComponent} from './source_code_component'; import {SourceCodeContainer} from './source_code_container'; diff --git a/tensorboard/webapp/widgets/text/truncated_path_module.ts b/tensorboard/webapp/widgets/text/truncated_path_module.ts index 7bcdec7486..f89406cd2a 100644 --- a/tensorboard/webapp/widgets/text/truncated_path_module.ts +++ b/tensorboard/webapp/widgets/text/truncated_path_module.ts @@ -14,7 +14,6 @@ limitations under the License. ==============================================================================*/ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; - import {TruncatedPathComponent} from './truncated_path_component'; /** diff --git a/tensorboard/webapp/widgets/text/truncated_path_test.ts b/tensorboard/webapp/widgets/text/truncated_path_test.ts index 3a16e52be4..fc1c8cf6cc 100644 --- a/tensorboard/webapp/widgets/text/truncated_path_test.ts +++ b/tensorboard/webapp/widgets/text/truncated_path_test.ts @@ -15,7 +15,6 @@ limitations under the License. import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; - import {TruncatedPathComponent} from './truncated_path_component'; describe('truncated path', () => { diff --git a/yarn.lock b/yarn.lock index 5e76e74c20..61e6524e17 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4393,6 +4393,11 @@ plottable@^3.9.0: tslib "~1.8.0" typesettable "4.1.0" +prettier-plugin-organize-imports@2.3.4: + version "2.3.4" + resolved "https://registry.yarnpkg.com/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-2.3.4.tgz#65473861ae5ab7960439fff270a2258558fbe9ba" + integrity sha512-R8o23sf5iVL/U71h9SFUdhdOEPsi3nm42FD/oDYIZ2PQa4TNWWuWecxln6jlIQzpZTDMUeO1NicJP6lLn2TtRw== + prettier@2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c"