From 0f0981c5e960d9c3d68caf435543ac30829f4a98 Mon Sep 17 00:00:00 2001 From: Stacey Gammon Date: Fri, 20 Jan 2017 10:01:55 -0500 Subject: [PATCH] Restructure dashboard files and folders (#9969) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Restructure dashboard files and folders * Try to stay DRY avoid duplicate ‘dashboard’ naming when unnecessary * rename index => dashboard and add an index.js with imports rename style * un-dig --- .../public/dashboard/__tests__/dashboard_panels.js | 4 ++-- .../public/dashboard/{directives => }/grid.js | 4 ++-- src/core_plugins/kibana/public/dashboard/index.js | 14 +++++++------- .../get_object_loaders_for_dashboard.js | 0 .../panel/lib => panel}/load_saved_object.js | 0 .../dashboard/{components => }/panel/panel.html | 0 .../dashboard_panel.js => panel/panel.js} | 8 ++++---- .../{components/panel/lib => panel}/panel_state.js | 0 .../{components/panel/lib => panel}/panel_utils.js | 2 +- .../saved_dashboard.js} | 0 .../saved_dashboard_register.js | 0 .../saved_dashboards.js | 2 +- .../dashboard/styles/{main.less => index.less} | 0 .../add_panel.html} | 0 .../dashboard/{ => top_nav}/get_top_nav_config.js | 10 +++++----- .../load_dashboard.html => top_nav/open.html} | 0 .../dashboard/{partials => top_nav}/options.html | 0 .../save_dashboard.html => top_nav/save.html} | 0 .../dashboard/{partials => top_nav}/share.html | 0 test/functional/apps/dashboard/_dashboard.js | 2 +- 20 files changed, 23 insertions(+), 23 deletions(-) rename src/core_plugins/kibana/public/dashboard/{directives => }/grid.js (97%) rename src/core_plugins/kibana/public/dashboard/{services => panel}/get_object_loaders_for_dashboard.js (100%) rename src/core_plugins/kibana/public/dashboard/{components/panel/lib => panel}/load_saved_object.js (100%) rename src/core_plugins/kibana/public/dashboard/{components => }/panel/panel.html (100%) rename src/core_plugins/kibana/public/dashboard/{directives/dashboard_panel.js => panel/panel.js} (93%) rename src/core_plugins/kibana/public/dashboard/{components/panel/lib => panel}/panel_state.js (100%) rename src/core_plugins/kibana/public/dashboard/{components/panel/lib => panel}/panel_utils.js (95%) rename src/core_plugins/kibana/public/dashboard/{services/_saved_dashboard.js => saved_dashboard/saved_dashboard.js} (100%) rename src/core_plugins/kibana/public/dashboard/{services => saved_dashboard}/saved_dashboard_register.js (100%) rename src/core_plugins/kibana/public/dashboard/{services => saved_dashboard}/saved_dashboards.js (91%) rename src/core_plugins/kibana/public/dashboard/styles/{main.less => index.less} (100%) rename src/core_plugins/kibana/public/dashboard/{partials/pick_visualization.html => top_nav/add_panel.html} (100%) rename src/core_plugins/kibana/public/dashboard/{ => top_nav}/get_top_nav_config.js (80%) rename src/core_plugins/kibana/public/dashboard/{partials/load_dashboard.html => top_nav/open.html} (100%) rename src/core_plugins/kibana/public/dashboard/{partials => top_nav}/options.html (100%) rename src/core_plugins/kibana/public/dashboard/{partials/save_dashboard.html => top_nav/save.html} (100%) rename src/core_plugins/kibana/public/dashboard/{partials => top_nav}/share.html (100%) diff --git a/src/core_plugins/kibana/public/dashboard/__tests__/dashboard_panels.js b/src/core_plugins/kibana/public/dashboard/__tests__/dashboard_panels.js index 301664107de5..c0803492467e 100644 --- a/src/core_plugins/kibana/public/dashboard/__tests__/dashboard_panels.js +++ b/src/core_plugins/kibana/public/dashboard/__tests__/dashboard_panels.js @@ -1,8 +1,8 @@ import angular from 'angular'; import expect from 'expect.js'; import ngMock from 'ng_mock'; -import 'plugins/kibana/dashboard/services/_saved_dashboard'; -import { DEFAULT_PANEL_WIDTH, DEFAULT_PANEL_HEIGHT } from '../components/panel/lib/panel_state'; +import 'plugins/kibana/dashboard/saved_dashboard/saved_dashboard'; +import { DEFAULT_PANEL_WIDTH, DEFAULT_PANEL_HEIGHT } from 'plugins/kibana/dashboard/panel/panel_state'; describe('dashboard panels', function () { let $scope; diff --git a/src/core_plugins/kibana/public/dashboard/directives/grid.js b/src/core_plugins/kibana/public/dashboard/grid.js similarity index 97% rename from src/core_plugins/kibana/public/dashboard/directives/grid.js rename to src/core_plugins/kibana/public/dashboard/grid.js index 82dc3e96737b..2a2f96a0b950 100644 --- a/src/core_plugins/kibana/public/dashboard/directives/grid.js +++ b/src/core_plugins/kibana/public/dashboard/grid.js @@ -3,8 +3,8 @@ import $ from 'jquery'; import Binder from 'ui/binder'; import 'gridster'; import uiModules from 'ui/modules'; -import { PanelUtils } from 'plugins/kibana/dashboard/components/panel/lib/panel_utils'; -import { getPersistedStateId } from 'plugins/kibana/dashboard/components/panel/lib/panel_state'; +import { PanelUtils } from 'plugins/kibana/dashboard/panel/panel_utils'; +import { getPersistedStateId } from 'plugins/kibana/dashboard/panel/panel_state'; const app = uiModules.get('app/dashboard'); diff --git a/src/core_plugins/kibana/public/dashboard/index.js b/src/core_plugins/kibana/public/dashboard/index.js index 225c4ccaa95e..43b051fa82d7 100644 --- a/src/core_plugins/kibana/public/dashboard/index.js +++ b/src/core_plugins/kibana/public/dashboard/index.js @@ -6,19 +6,19 @@ import 'ui/config'; import 'ui/notify'; import 'ui/typeahead'; import 'ui/share'; -import 'plugins/kibana/dashboard/directives/grid'; -import 'plugins/kibana/dashboard/directives/dashboard_panel'; -import 'plugins/kibana/dashboard/services/saved_dashboards'; -import 'plugins/kibana/dashboard/styles/main.less'; +import 'plugins/kibana/dashboard/grid'; +import 'plugins/kibana/dashboard/panel/panel'; +import 'plugins/kibana/dashboard/saved_dashboard/saved_dashboards'; +import 'plugins/kibana/dashboard/styles/index.less'; import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter'; import DocTitleProvider from 'ui/doc_title'; import stateMonitorFactory from 'ui/state_management/state_monitor_factory'; import uiRoutes from 'ui/routes'; import uiModules from 'ui/modules'; import indexTemplate from 'plugins/kibana/dashboard/index.html'; -import { savedDashboardRegister } from 'plugins/kibana/dashboard/services/saved_dashboard_register'; -import { getTopNavConfig } from './get_top_nav_config'; -import { createPanelState } from 'plugins/kibana/dashboard/components/panel/lib/panel_state'; +import { savedDashboardRegister } from 'plugins/kibana/dashboard/saved_dashboard/saved_dashboard_register'; +import { getTopNavConfig } from './top_nav/get_top_nav_config'; +import { createPanelState } from 'plugins/kibana/dashboard/panel/panel_state'; import { DashboardConstants } from './dashboard_constants'; import UtilsBrushEventProvider from 'ui/utils/brush_event'; import FilterBarFilterBarClickHandlerProvider from 'ui/filter_bar/filter_bar_click_handler'; diff --git a/src/core_plugins/kibana/public/dashboard/services/get_object_loaders_for_dashboard.js b/src/core_plugins/kibana/public/dashboard/panel/get_object_loaders_for_dashboard.js similarity index 100% rename from src/core_plugins/kibana/public/dashboard/services/get_object_loaders_for_dashboard.js rename to src/core_plugins/kibana/public/dashboard/panel/get_object_loaders_for_dashboard.js diff --git a/src/core_plugins/kibana/public/dashboard/components/panel/lib/load_saved_object.js b/src/core_plugins/kibana/public/dashboard/panel/load_saved_object.js similarity index 100% rename from src/core_plugins/kibana/public/dashboard/components/panel/lib/load_saved_object.js rename to src/core_plugins/kibana/public/dashboard/panel/load_saved_object.js diff --git a/src/core_plugins/kibana/public/dashboard/components/panel/panel.html b/src/core_plugins/kibana/public/dashboard/panel/panel.html similarity index 100% rename from src/core_plugins/kibana/public/dashboard/components/panel/panel.html rename to src/core_plugins/kibana/public/dashboard/panel/panel.html diff --git a/src/core_plugins/kibana/public/dashboard/directives/dashboard_panel.js b/src/core_plugins/kibana/public/dashboard/panel/panel.js similarity index 93% rename from src/core_plugins/kibana/public/dashboard/directives/dashboard_panel.js rename to src/core_plugins/kibana/public/dashboard/panel/panel.js index 9730f89837c4..ddf1c139a921 100644 --- a/src/core_plugins/kibana/public/dashboard/directives/dashboard_panel.js +++ b/src/core_plugins/kibana/public/dashboard/panel/panel.js @@ -1,12 +1,12 @@ import _ from 'lodash'; import 'ui/visualize'; import 'ui/doc_table'; -import 'plugins/kibana/dashboard/services/get_object_loaders_for_dashboard'; +import 'plugins/kibana/dashboard/panel/get_object_loaders_for_dashboard'; import FilterManagerProvider from 'ui/filter_manager'; import uiModules from 'ui/modules'; -import panelTemplate from 'plugins/kibana/dashboard/components/panel/panel.html'; -import { getPersistedStateId } from 'plugins/kibana/dashboard/components/panel/lib/panel_state'; -import { loadSavedObject } from 'plugins/kibana/dashboard/components/panel/lib/load_saved_object'; +import panelTemplate from 'plugins/kibana/dashboard/panel/panel.html'; +import { getPersistedStateId } from 'plugins/kibana/dashboard/panel/panel_state'; +import { loadSavedObject } from 'plugins/kibana/dashboard/panel/load_saved_object'; uiModules .get('app/dashboard') diff --git a/src/core_plugins/kibana/public/dashboard/components/panel/lib/panel_state.js b/src/core_plugins/kibana/public/dashboard/panel/panel_state.js similarity index 100% rename from src/core_plugins/kibana/public/dashboard/components/panel/lib/panel_state.js rename to src/core_plugins/kibana/public/dashboard/panel/panel_state.js diff --git a/src/core_plugins/kibana/public/dashboard/components/panel/lib/panel_utils.js b/src/core_plugins/kibana/public/dashboard/panel/panel_utils.js similarity index 95% rename from src/core_plugins/kibana/public/dashboard/components/panel/lib/panel_utils.js rename to src/core_plugins/kibana/public/dashboard/panel/panel_utils.js index 5856d71f884f..f9371aa5137a 100644 --- a/src/core_plugins/kibana/public/dashboard/components/panel/lib/panel_utils.js +++ b/src/core_plugins/kibana/public/dashboard/panel/panel_utils.js @@ -1,4 +1,4 @@ -import { DEFAULT_PANEL_WIDTH, DEFAULT_PANEL_HEIGHT } from 'plugins/kibana/dashboard/components/panel/lib/panel_state'; +import { DEFAULT_PANEL_WIDTH, DEFAULT_PANEL_HEIGHT } from 'plugins/kibana/dashboard/panel/panel_state'; export class PanelUtils { /** diff --git a/src/core_plugins/kibana/public/dashboard/services/_saved_dashboard.js b/src/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.js similarity index 100% rename from src/core_plugins/kibana/public/dashboard/services/_saved_dashboard.js rename to src/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.js diff --git a/src/core_plugins/kibana/public/dashboard/services/saved_dashboard_register.js b/src/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_register.js similarity index 100% rename from src/core_plugins/kibana/public/dashboard/services/saved_dashboard_register.js rename to src/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_register.js diff --git a/src/core_plugins/kibana/public/dashboard/services/saved_dashboards.js b/src/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.js similarity index 91% rename from src/core_plugins/kibana/public/dashboard/services/saved_dashboards.js rename to src/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.js index ec1d3a23c912..346b4b5650d4 100644 --- a/src/core_plugins/kibana/public/dashboard/services/saved_dashboards.js +++ b/src/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import Scanner from 'ui/utils/scanner'; -import 'plugins/kibana/dashboard/services/_saved_dashboard'; +import 'plugins/kibana/dashboard/saved_dashboard/saved_dashboard'; import uiModules from 'ui/modules'; const module = uiModules.get('app/dashboard'); import { SavedObjectLoader } from 'ui/courier/saved_object/saved_object_loader'; diff --git a/src/core_plugins/kibana/public/dashboard/styles/main.less b/src/core_plugins/kibana/public/dashboard/styles/index.less similarity index 100% rename from src/core_plugins/kibana/public/dashboard/styles/main.less rename to src/core_plugins/kibana/public/dashboard/styles/index.less diff --git a/src/core_plugins/kibana/public/dashboard/partials/pick_visualization.html b/src/core_plugins/kibana/public/dashboard/top_nav/add_panel.html similarity index 100% rename from src/core_plugins/kibana/public/dashboard/partials/pick_visualization.html rename to src/core_plugins/kibana/public/dashboard/top_nav/add_panel.html diff --git a/src/core_plugins/kibana/public/dashboard/get_top_nav_config.js b/src/core_plugins/kibana/public/dashboard/top_nav/get_top_nav_config.js similarity index 80% rename from src/core_plugins/kibana/public/dashboard/get_top_nav_config.js rename to src/core_plugins/kibana/public/dashboard/top_nav/get_top_nav_config.js index d98a15ddaed0..e7c9f7ec3064 100644 --- a/src/core_plugins/kibana/public/dashboard/get_top_nav_config.js +++ b/src/core_plugins/kibana/public/dashboard/top_nav/get_top_nav_config.js @@ -36,7 +36,7 @@ function getAddConfig() { key: 'add', description: 'Add a panel to the dashboard', testId: 'dashboardAddPanelButton', - template: require('plugins/kibana/dashboard/partials/pick_visualization.html') + template: require('plugins/kibana/dashboard/top_nav/add_panel.html') }; } @@ -48,7 +48,7 @@ function getSaveConfig() { key: 'save', description: 'Save Dashboard', testId: 'dashboardSaveButton', - template: require('plugins/kibana/dashboard/partials/save_dashboard.html') + template: require('plugins/kibana/dashboard/top_nav/save.html') }; } @@ -60,7 +60,7 @@ function getOpenConfig() { key: 'open', description: 'Open Saved Dashboard', testId: 'dashboardOpenButton', - template: require('plugins/kibana/dashboard/partials/load_dashboard.html') + template: require('plugins/kibana/dashboard/top_nav/open.html') }; } @@ -72,7 +72,7 @@ function getShareConfig() { key: 'share', description: 'Share Dashboard', testId: 'dashboardShareButton', - template: require('plugins/kibana/dashboard/partials/share.html') + template: require('plugins/kibana/dashboard/top_nav/share.html') }; } @@ -84,6 +84,6 @@ function getOptionsConfig() { key: 'options', description: 'Options', testId: 'dashboardOptionsButton', - template: require('plugins/kibana/dashboard/partials/options.html') + template: require('plugins/kibana/dashboard/top_nav/options.html') }; } diff --git a/src/core_plugins/kibana/public/dashboard/partials/load_dashboard.html b/src/core_plugins/kibana/public/dashboard/top_nav/open.html similarity index 100% rename from src/core_plugins/kibana/public/dashboard/partials/load_dashboard.html rename to src/core_plugins/kibana/public/dashboard/top_nav/open.html diff --git a/src/core_plugins/kibana/public/dashboard/partials/options.html b/src/core_plugins/kibana/public/dashboard/top_nav/options.html similarity index 100% rename from src/core_plugins/kibana/public/dashboard/partials/options.html rename to src/core_plugins/kibana/public/dashboard/top_nav/options.html diff --git a/src/core_plugins/kibana/public/dashboard/partials/save_dashboard.html b/src/core_plugins/kibana/public/dashboard/top_nav/save.html similarity index 100% rename from src/core_plugins/kibana/public/dashboard/partials/save_dashboard.html rename to src/core_plugins/kibana/public/dashboard/top_nav/save.html diff --git a/src/core_plugins/kibana/public/dashboard/partials/share.html b/src/core_plugins/kibana/public/dashboard/top_nav/share.html similarity index 100% rename from src/core_plugins/kibana/public/dashboard/partials/share.html rename to src/core_plugins/kibana/public/dashboard/top_nav/share.html diff --git a/test/functional/apps/dashboard/_dashboard.js b/test/functional/apps/dashboard/_dashboard.js index b25422ea2f00..2088ab4019c1 100644 --- a/test/functional/apps/dashboard/_dashboard.js +++ b/test/functional/apps/dashboard/_dashboard.js @@ -2,7 +2,7 @@ import expect from 'expect.js'; import { DEFAULT_PANEL_WIDTH, DEFAULT_PANEL_HEIGHT -} from '../../../../src/core_plugins/kibana/public/dashboard/components/panel/lib/panel_state'; +} from '../../../../src/core_plugins/kibana/public/dashboard/panel/panel_state'; import { bdd,