changed name back to use underscore instead of camelcase, need to think more about this

pull/9559/head
Torkel Ödegaard 8 years ago
parent 83e496606e
commit 215d59865e
  1. 2
      public/app/features/dashboard/dashboard_ctrl.ts
  2. 2
      public/app/features/dashboard/dashboard_model.ts
  3. 2
      public/app/features/dashboard/dashboard_srv.ts
  4. 6
      public/app/features/dashboard/dashgrid/DashboardGrid.tsx
  5. 2
      public/app/features/dashboard/dashgrid/DashboardPanel.tsx
  6. 2
      public/app/features/dashboard/dashgrid/PanelContainer.ts
  7. 2
      public/app/features/dashboard/dashnav/dashnav.ts
  8. 2
      public/app/features/dashboard/history/history.ts
  9. 2
      public/app/features/dashboard/history/history_srv.ts
  10. 0
      public/app/features/dashboard/panel_model.ts
  11. 4
      public/app/features/dashboard/specs/dashboard_model_specs.ts
  12. 3
      public/app/features/dashboard/specs/exporter_specs.ts
  13. 2
      public/app/features/panel/metrics_tab.ts
  14. 2
      public/app/features/panel/panel_ctrl.ts
  15. 2
      public/test/specs/helpers.ts
  16. 8
      scripts/webpack/webpack.test.js

@ -2,7 +2,7 @@ import config from 'app/core/config';
import coreModule from 'app/core/core_module';
import {PanelContainer} from './dashgrid/PanelContainer';
import {DashboardModel} from './DashboardModel';
import {DashboardModel} from './dashboard_model';
export class DashboardCtrl implements PanelContainer {
dashboard: DashboardModel;

@ -4,7 +4,7 @@ import _ from 'lodash';
import {DEFAULT_ANNOTATION_COLOR} from 'app/core/utils/colors';
import {Emitter, contextSrv, appEvents} from 'app/core/core';
import {DashboardRow} from './row/row_model';
import {PanelModel} from './PanelModel';
import {PanelModel} from './panel_model';
import sortByKeys from 'app/core/utils/sort_by_keys';
export const CELL_HEIGHT = 30;

@ -1,5 +1,5 @@
import coreModule from 'app/core/core_module';
import {DashboardModel} from './DashboardModel';
import {DashboardModel} from './dashboard_model';
export class DashboardSrv {
dash: any;

@ -1,11 +1,11 @@
import React from 'react';
import coreModule from 'app/core/core_module';
import ReactGridLayout from 'react-grid-layout';
import {CELL_HEIGHT, CELL_VMARGIN} from '../DashboardModel';
import {CELL_HEIGHT, CELL_VMARGIN} from '../dashboard_model';
import {DashboardPanel} from './DashboardPanel';
import {DashboardModel} from '../DashboardModel';
import {DashboardModel} from '../dashboard_model';
import {PanelContainer} from './PanelContainer';
import {PanelModel} from '../PanelModel';
import {PanelModel} from '../panel_model';
import classNames from 'classnames';
import sizeMe from 'react-sizeme';

@ -1,5 +1,5 @@
import React from 'react';
import {PanelModel} from '../PanelModel';
import {PanelModel} from '../panel_model';
import {PanelContainer} from './PanelContainer';
import {AttachedPanel} from './PanelLoader';

@ -1,4 +1,4 @@
import {DashboardModel}  from '../DashboardModel';
import {DashboardModel}  from '../dashboard_model';
import {PanelLoader} from './PanelLoader';
export interface PanelContainer {

@ -4,7 +4,7 @@ import _ from 'lodash';
import moment from 'moment';
import angular from 'angular';
import {appEvents, NavModel} from 'app/core/core';
import {DashboardModel} from '../DashboardModel';
import {DashboardModel} from '../dashboard_model';
export class DashNavCtrl {
dashboard: DashboardModel;

@ -6,7 +6,7 @@ import _ from 'lodash';
import angular from 'angular';
import moment from 'moment';
import {DashboardModel} from '../DashboardModel';
import {DashboardModel} from '../dashboard_model';
import {HistoryListOpts, RevisionsModel, CalculateDiffOptions, HistorySrv} from './history_srv';
export class HistoryListCtrl {

@ -1,6 +1,6 @@
import _ from 'lodash';
import coreModule from 'app/core/core_module';
import {DashboardModel} from '../DashboardModel';
import {DashboardModel} from '../dashboard_model';
export interface HistoryListOpts {
limit: number;

@ -1,8 +1,8 @@
import {describe, beforeEach, it, expect} from 'test/lib/common';
import _ from 'lodash';
import {DashboardModel} from '../DashboardModel';
import {PanelModel} from '../PanelModel';
import {DashboardModel} from '../dashboard_model';
import {PanelModel} from '../panel_model';
describe('DashboardModel', function() {

@ -3,7 +3,7 @@ import {describe, beforeEach, it, sinon, expect} from 'test/lib/common';
import _ from 'lodash';
import config from 'app/core/config';
import {DashboardExporter} from '../export/exporter';
import {DashboardModel} from '../DashboardModel';
import {DashboardModel} from '../dashboard_model';
describe('given dashboard with repeated panels', function() {
var dash, exported;
@ -103,7 +103,6 @@ describe('given dashboard with repeated panels', function() {
};
dash = new DashboardModel(dash, {});
dash.getSaveModelClone();
var exporter = new DashboardExporter(datasourceSrvStub);
exporter.makeExportable(dash).then(clean => {
exported = clean;

@ -1,4 +1,4 @@
import {DashboardModel} from '../dashboard/DashboardModel';
import {DashboardModel} from '../dashboard/dashboard_model';
import Remarkable from 'remarkable';
export class MetricsTabCtrl {

@ -3,7 +3,7 @@ import _ from 'lodash';
import $ from 'jquery';
import {profiler} from 'app/core/profiler';
import Remarkable from 'remarkable';
import {CELL_HEIGHT, CELL_VMARGIN} from '../dashboard/DashboardModel';
import {CELL_HEIGHT, CELL_VMARGIN} from '../dashboard/dashboard_model';
const TITLE_HEIGHT = 25;
const EMPTY_TITLE_HEIGHT = 9;

@ -2,7 +2,7 @@ import _ from 'lodash';
import config from 'app/core/config';
import * as dateMath from 'app/core/utils/datemath';
import {angularMocks, sinon} from '../lib/common';
import {PanelModel} from 'app/features/dashboard/PanelModel';
import {PanelModel} from 'app/features/dashboard/panel_model';
export function ControllerTestContext() {
var self = this;

@ -13,10 +13,10 @@ config = merge(common, {
fs: 'empty'
},
plugins: [
new webpack.SourceMapDevToolPlugin({
filename: null, // if no value is provided the sourcemap is inlined
test: /\.(ts|js)($|\?)/i // process .js and .ts files only
})
// new webpack.SourceMapDevToolPlugin({
// filename: null, // if no value is provided the sourcemap is inlined
// test: /\.(ts|js)($|\?)/i // process .js and .ts files only
// })
]
});

Loading…
Cancel
Save