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

This commit is contained in:
Torkel Ödegaard 2017-10-12 20:02:07 +02:00
parent 83e496606e
commit 215d59865e
16 changed files with 21 additions and 22 deletions

View File

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

View File

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

View File

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

View File

@ -1,11 +1,11 @@
import React from 'react'; import React from 'react';
import coreModule from 'app/core/core_module'; import coreModule from 'app/core/core_module';
import ReactGridLayout from 'react-grid-layout'; 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 {DashboardPanel} from './DashboardPanel';
import {DashboardModel} from '../DashboardModel'; import {DashboardModel} from '../dashboard_model';
import {PanelContainer} from './PanelContainer'; import {PanelContainer} from './PanelContainer';
import {PanelModel} from '../PanelModel'; import {PanelModel} from '../panel_model';
import classNames from 'classnames'; import classNames from 'classnames';
import sizeMe from 'react-sizeme'; import sizeMe from 'react-sizeme';

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -3,7 +3,7 @@ import _ from 'lodash';
import $ from 'jquery'; import $ from 'jquery';
import {profiler} from 'app/core/profiler'; import {profiler} from 'app/core/profiler';
import Remarkable from 'remarkable'; 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 TITLE_HEIGHT = 25;
const EMPTY_TITLE_HEIGHT = 9; const EMPTY_TITLE_HEIGHT = 9;

View File

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

View File

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