Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moving some JS folders #4820

Merged
merged 2 commits into from
Apr 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion superset/assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"build": "NODE_ENV=production webpack --colors --progress",
"lint": "eslint --ignore-path=.eslintignore --ext .js,.jsx .",
"lint-fix": "eslint --fix --ignore-path=.eslintignore --ext .js,.jsx .",
"sync-backend": "babel-node --presets env javascripts/syncBackend.js"
"sync-backend": "babel-node --presets env src/syncBackend.js"
},
"repository": {
"type": "git",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { describe, it, beforeEach } from 'mocha';
import { shallow } from 'enzyme';
import { Button } from 'react-bootstrap';
import Select from 'react-virtualized-select';
import AddSliceContainer from '../../../javascripts/addSlice/AddSliceContainer';
import AddSliceContainer from '../../../src/addSlice/AddSliceContainer';

const defaultProps = {
datasources: [
Expand Down
8 changes: 4 additions & 4 deletions superset/assets/spec/javascripts/chart/Chart_spec.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import { describe, it } from 'mocha';
import { expect } from 'chai';
import sinon from 'sinon';

import { chart as initChart } from '../../../javascripts/chart/chartReducer';
import Chart from '../../../javascripts/chart/Chart';
import ChartBody from '../../../javascripts/chart/ChartBody';
import Loading from '../../../javascripts/components/Loading';
import { chart as initChart } from '../../../src/chart/chartReducer';
import Chart from '../../../src/chart/Chart';
import ChartBody from '../../../src/chart/ChartBody';
import Loading from '../../../src/components/Loading';

describe('Chart', () => {
const chart = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { expect } from 'chai';

import { Table, Thead, Td, Th, Tr } from 'reactable';

import AlteredSliceTag from '../../../javascripts/components/AlteredSliceTag';
import ModalTrigger from '../../../javascripts/components/ModalTrigger';
import TooltipWrapper from '../../../javascripts/components/TooltipWrapper';
import AlteredSliceTag from '../../../src/components/AlteredSliceTag';
import ModalTrigger from '../../../src/components/ModalTrigger';
import TooltipWrapper from '../../../src/components/TooltipWrapper';

const defaultProps = {
origFormData: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { describe, it } from 'mocha';
import { expect } from 'chai';
import sinon from 'sinon';

import AsyncSelect from '../../../javascripts/components/AsyncSelect';
import AsyncSelect from '../../../src/components/AsyncSelect';

describe('AsyncSelect', () => {
const mockedProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { describe, it } from 'mocha';
import { shallow } from 'enzyme';
import { Label } from 'react-bootstrap';

import CachedLabel from '../../../javascripts/components/CachedLabel';
import CachedLabel from '../../../src/components/CachedLabel';

describe('CachedLabel', () => {
const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { describe, it } from 'mocha';
import sinon from 'sinon';
import { shallow } from 'enzyme';

import Checkbox from '../../../javascripts/components/Checkbox';
import Checkbox from '../../../src/components/Checkbox';

describe('Checkbox', () => {
const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { expect } from 'chai';
import { describe, it } from 'mocha';
import { shallow } from 'enzyme';

import ColumnOption from '../../../javascripts/components/ColumnOption';
import ColumnTypeLabel from '../../../javascripts/components/ColumnTypeLabel';
import InfoTooltipWithTrigger from '../../../javascripts/components/InfoTooltipWithTrigger';
import ColumnOption from '../../../src/components/ColumnOption';
import ColumnTypeLabel from '../../../src/components/ColumnTypeLabel';
import InfoTooltipWithTrigger from '../../../src/components/InfoTooltipWithTrigger';

describe('ColumnOption', () => {
const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { expect } from 'chai';
import { describe, it } from 'mocha';
import { shallow } from 'enzyme';

import ColumnTypeLabel from '../../../javascripts/components/ColumnTypeLabel';
import ColumnTypeLabel from '../../../src/components/ColumnTypeLabel';

describe('ColumnOption', () => {
const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { expect } from 'chai';
import { describe, it } from 'mocha';

import CopyToClipboard from '../../../javascripts/components/CopyToClipboard';
import CopyToClipboard from '../../../src/components/CopyToClipboard';

describe('CopyToClipboard', () => {
const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { describe, it } from 'mocha';
import { expect } from 'chai';
import { mount } from 'enzyme';
import FilterableTable from '../../../../javascripts/components/FilterableTable/FilterableTable';
import FilterableTable from '../../../../src/components/FilterableTable/FilterableTable';

describe('FilterableTable', () => {
const mockedProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { expect } from 'chai';
import { describe, it } from 'mocha';
import { shallow } from 'enzyme';

import MetricOption from '../../../javascripts/components/MetricOption';
import ColumnTypeLabel from '../../../javascripts/components/ColumnTypeLabel';
import InfoTooltipWithTrigger from '../../../javascripts/components/InfoTooltipWithTrigger';
import MetricOption from '../../../src/components/MetricOption';
import ColumnTypeLabel from '../../../src/components/ColumnTypeLabel';
import InfoTooltipWithTrigger from '../../../src/components/InfoTooltipWithTrigger';

describe('MetricOption', () => {
const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { expect } from 'chai';
import { describe, it } from 'mocha';

import ModalTrigger from '../../../javascripts/components/ModalTrigger';
import ModalTrigger from '../../../src/components/ModalTrigger';

describe('ModalTrigger', () => {
const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { describe, it } from 'mocha';
import VirtualizedSelect from 'react-virtualized-select';
import Select, { Creatable } from 'react-select';

import OnPasteSelect from '../../../javascripts/components/OnPasteSelect';
import OnPasteSelect from '../../../src/components/OnPasteSelect';

const defaultProps = {
onChange: sinon.spy(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { shallow } from 'enzyme';
import { describe, it } from 'mocha';
import { expect } from 'chai';

import InfoTooltipWithTrigger from '../../../javascripts/components/InfoTooltipWithTrigger';
import OptionDescription from '../../../javascripts/components/OptionDescription';
import InfoTooltipWithTrigger from '../../../src/components/InfoTooltipWithTrigger';
import OptionDescription from '../../../src/components/OptionDescription';

const defaultProps = {
option: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { expect } from 'chai';
import { describe, it } from 'mocha';
import { shallow } from 'enzyme';

import PopoverSection from '../../../javascripts/components/PopoverSection';
import PopoverSection from '../../../src/components/PopoverSection';

describe('PopoverSection', () => {
const defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { expect } from 'chai';
import { describe, it } from 'mocha';
import { shallow } from 'enzyme';

import VirtualizedRendererWrap from '../../../javascripts/components/VirtualizedRendererWrap';
import VirtualizedRendererWrap from '../../../src/components/VirtualizedRendererWrap';

const defaultProps = {
focusedOption: { label: 'focusedOn', value: 'focusedOn' },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { mount } from 'enzyme';
import { describe, it } from 'mocha';
import { expect } from 'chai';

import CodeModal from '../../../javascripts/dashboard/components/CodeModal';
import CodeModal from '../../../src/dashboard/components/CodeModal';

describe('CodeModal', () => {
const mockedProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { mount } from 'enzyme';
import { describe, it } from 'mocha';
import { expect } from 'chai';

import CssEditor from '../../../javascripts/dashboard/components/CssEditor';
import CssEditor from '../../../src/dashboard/components/CssEditor';

describe('CssEditor', () => {
const mockedProps = {
Expand Down
6 changes: 3 additions & 3 deletions superset/assets/spec/javascripts/dashboard/Dashboard_spec.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { describe, it } from 'mocha';
import { expect } from 'chai';
import sinon from 'sinon';

import * as dashboardActions from '../../../javascripts/dashboard/actions';
import * as chartActions from '../../../javascripts/chart/chartAction';
import Dashboard from '../../../javascripts/dashboard/components/Dashboard';
import * as dashboardActions from '../../../src/dashboard/actions';
import * as chartActions from '../../../src/chart/chartAction';
import Dashboard from '../../../src/dashboard/components/Dashboard';
import { defaultFilters, dashboard, charts } from './fixtures';

describe('Dashboard', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { mount } from 'enzyme';
import { describe, it } from 'mocha';
import { expect } from 'chai';

import RefreshIntervalModal from '../../../javascripts/dashboard/components/RefreshIntervalModal';
import RefreshIntervalModal from '../../../src/dashboard/components/RefreshIntervalModal';

describe('RefreshIntervalModal', () => {
const mockedProps = {
Expand Down
2 changes: 1 addition & 1 deletion superset/assets/spec/javascripts/dashboard/fixtures.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getInitialState } from '../../../javascripts/dashboard/reducers';
import { getInitialState } from '../../../src/dashboard/reducers';

export const defaultFilters = {
256: { region: [] },
Expand Down
4 changes: 2 additions & 2 deletions superset/assets/spec/javascripts/dashboard/reducers_spec.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { describe, it } from 'mocha';
import { expect } from 'chai';

import { dashboard as reducers } from '../../../javascripts/dashboard/reducers';
import * as actions from '../../../javascripts/dashboard/actions';
import { dashboard as reducers } from '../../../src/dashboard/reducers';
import * as actions from '../../../src/dashboard/actions';
import { defaultFilters, dashboard as initState } from './fixtures';

describe('Dashboard reducers', () => {
Expand Down
4 changes: 2 additions & 2 deletions superset/assets/spec/javascripts/explore/AdhocMetric_spec.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { expect } from 'chai';
import { describe, it } from 'mocha';

import AdhocMetric, { EXPRESSION_TYPES } from '../../../javascripts/explore/AdhocMetric';
import { AGGREGATES } from '../../../javascripts/explore/constants';
import AdhocMetric, { EXPRESSION_TYPES } from '../../../src/explore/AdhocMetric';
import { AGGREGATES } from '../../../src/explore/constants';

const valueColumn = { type: 'DOUBLE', column_name: 'value' };

Expand Down
4 changes: 2 additions & 2 deletions superset/assets/spec/javascripts/explore/chartActions_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { it, describe } from 'mocha';
import { expect } from 'chai';
import sinon from 'sinon';
import $ from 'jquery';
import * as exploreUtils from '../../../javascripts/explore/exploreUtils';
import * as actions from '../../../javascripts/chart/chartAction';
import * as exploreUtils from '../../../src/explore/exploreUtils';
import * as actions from '../../../src/chart/chartAction';

describe('chart actions', () => {
let dispatch;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import { describe, it } from 'mocha';
import { shallow } from 'enzyme';
import { OverlayTrigger } from 'react-bootstrap';

import AdhocMetric from '../../../../javascripts/explore/AdhocMetric';
import AdhocMetricEditPopoverTitle from '../../../../javascripts/explore/components/AdhocMetricEditPopoverTitle';
import { AGGREGATES } from '../../../../javascripts/explore/constants';
import AdhocMetric from '../../../../src/explore/AdhocMetric';
import AdhocMetricEditPopoverTitle from '../../../../src/explore/components/AdhocMetricEditPopoverTitle';
import { AGGREGATES } from '../../../../src/explore/constants';

const columns = [
{ type: 'VARCHAR(255)', column_name: 'source' },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import { describe, it } from 'mocha';
import { shallow } from 'enzyme';
import { Button, FormGroup, Popover } from 'react-bootstrap';

import AdhocMetric, { EXPRESSION_TYPES } from '../../../../javascripts/explore/AdhocMetric';
import AdhocMetricEditPopover from '../../../../javascripts/explore/components/AdhocMetricEditPopover';
import { AGGREGATES } from '../../../../javascripts/explore/constants';
import AdhocMetric, { EXPRESSION_TYPES } from '../../../../src/explore/AdhocMetric';
import AdhocMetricEditPopover from '../../../../src/explore/components/AdhocMetricEditPopover';
import { AGGREGATES } from '../../../../src/explore/constants';

const columns = [
{ type: 'VARCHAR(255)', column_name: 'source' },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import { describe, it } from 'mocha';
import { shallow } from 'enzyme';
import { Label, OverlayTrigger } from 'react-bootstrap';

import AdhocMetric from '../../../../javascripts/explore/AdhocMetric';
import AdhocMetricOption from '../../../../javascripts/explore/components/AdhocMetricOption';
import { AGGREGATES } from '../../../../javascripts/explore/constants';
import AdhocMetric from '../../../../src/explore/AdhocMetric';
import AdhocMetricOption from '../../../../src/explore/components/AdhocMetricOption';
import { AGGREGATES } from '../../../../src/explore/constants';

const columns = [
{ type: 'VARCHAR(255)', column_name: 'source' },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { expect } from 'chai';
import { describe, it } from 'mocha';
import { shallow } from 'enzyme';

import AggregateOption from '../../../../javascripts/explore/components/AggregateOption';
import AggregateOption from '../../../../src/explore/components/AggregateOption';

describe('AggregateOption', () => {
it('renders the aggregate', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { expect } from 'chai';
import { describe, it, beforeEach } from 'mocha';
import { mount } from 'enzyme';

import BoundsControl from '../../../../javascripts/explore/components/controls/BoundsControl';
import BoundsControl from '../../../../src/explore/components/controls/BoundsControl';

const defaultProps = {
name: 'y_axis_bounds',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { expect } from 'chai';
import { describe, it, beforeEach } from 'mocha';
import { shallow } from 'enzyme';

import CheckboxControl from '../../../../javascripts/explore/components/controls/CheckboxControl';
import ControlHeader from '../../../../javascripts/explore/components/ControlHeader';
import Checkbox from '../../../../javascripts/components/Checkbox';
import CheckboxControl from '../../../../src/explore/components/controls/CheckboxControl';
import ControlHeader from '../../../../src/explore/components/ControlHeader';
import Checkbox from '../../../../src/components/Checkbox';

const defaultProps = {
name: 'show_legend',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { OverlayTrigger } from 'react-bootstrap';
import { SketchPicker } from 'react-color';

import ColorPickerControl from
'../../../../javascripts/explore/components/controls/ColorPickerControl';
import ControlHeader from '../../../../javascripts/explore/components/ControlHeader';
'../../../../src/explore/components/controls/ColorPickerControl';
import ControlHeader from '../../../../src/explore/components/ControlHeader';

const defaultProps = {
value: { },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { mount } from 'enzyme';
import { Creatable } from 'react-select';

import ColorSchemeControl from
'../../../../javascripts/explore/components/controls/ColorSchemeControl';
import { ALL_COLOR_SCHEMES } from '../../../../javascripts/modules/colors';
'../../../../src/explore/components/controls/ColorSchemeControl';
import { ALL_COLOR_SCHEMES } from '../../../../src/modules/colors';

const defaultProps = {
options: Object.keys(ALL_COLOR_SCHEMES).map(s => ([s, s])),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import { shallow } from 'enzyme';
import { Panel } from 'react-bootstrap';

import InfoTooltipWithTrigger from
'../../../../javascripts/components/InfoTooltipWithTrigger';
'../../../../src/components/InfoTooltipWithTrigger';

import ControlPanelSection from
'../../../../javascripts/explore/components/ControlPanelSection';
'../../../../src/explore/components/ControlPanelSection';

const defaultProps = {
children: <div>a child element</div>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { expect } from 'chai';
import { describe, it, beforeEach } from 'mocha';
import { shallow } from 'enzyme';
import { getFormDataFromControls, defaultControls }
from '../../../../javascripts/explore/stores/store';
from '../../../../src/explore/stores/store';
import {
ControlPanelsContainer,
} from '../../../../javascripts/explore/components/ControlPanelsContainer';
import ControlPanelSection from '../../../../javascripts/explore/components/ControlPanelSection';
} from '../../../../src/explore/components/ControlPanelsContainer';
import ControlPanelSection from '../../../../src/explore/components/ControlPanelSection';

const defaultProps = {
datasource_type: 'table',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { expect } from 'chai';
import { describe, it } from 'mocha';
import { shallow } from 'enzyme';
import ControlSetRow from '../../../../javascripts/explore/components/ControlRow';
import ControlSetRow from '../../../../src/explore/components/ControlRow';

describe('ControlSetRow', () => {
it('renders a single row with one element', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { expect } from 'chai';
import { describe, it, beforeEach } from 'mocha';
import { shallow } from 'enzyme';
import { Modal } from 'react-bootstrap';
import DatasourceControl from '../../../../javascripts/explore/components/controls/DatasourceControl';
import DatasourceControl from '../../../../src/explore/components/controls/DatasourceControl';

const defaultProps = {
name: 'datasource',
Expand Down
Loading