mirror of
https://github.com/apache/superset.git
synced 2026-04-18 23:55:00 +00:00
Bumping the JS libs to fix the build (#2616)
* bumping the js libs * New linting rules * More linting * More * Done linting * npm >=4.5.0 * Bumping node * Tweaking the build * Fixing the damn build * Fixing the apps
This commit is contained in:
committed by
GitHub
parent
a2b30f35fc
commit
366ecefbaa
@@ -9,14 +9,13 @@ const propTypes = {
|
||||
};
|
||||
|
||||
const defaultProps = {
|
||||
codeCallback: () => {},
|
||||
};
|
||||
|
||||
export default class CodeModal extends React.PureComponent {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
this.state = {
|
||||
refreshFrequency: props.initialRefreshFrequency,
|
||||
};
|
||||
this.state = { code: props.code };
|
||||
}
|
||||
beforeOpen() {
|
||||
let code = this.props.code;
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
const $ = window.$ = require('jquery');
|
||||
|
||||
import React from 'react';
|
||||
|
||||
import { ButtonGroup } from 'react-bootstrap';
|
||||
|
||||
import Button from '../../components/Button';
|
||||
import CssEditor from './CssEditor';
|
||||
import RefreshIntervalModal from './RefreshIntervalModal';
|
||||
@@ -10,6 +8,8 @@ import SaveModal from './SaveModal';
|
||||
import CodeModal from './CodeModal';
|
||||
import SliceAdder from './SliceAdder';
|
||||
|
||||
const $ = window.$ = require('jquery');
|
||||
|
||||
const propTypes = {
|
||||
dashboard: React.PropTypes.object.isRequired,
|
||||
};
|
||||
@@ -22,14 +22,9 @@ class Controls extends React.PureComponent {
|
||||
cssTemplates: [],
|
||||
};
|
||||
}
|
||||
refresh() {
|
||||
this.props.dashboard.sliceObjects.forEach((slice) => {
|
||||
slice.render(true);
|
||||
});
|
||||
}
|
||||
componentWillMount() {
|
||||
$.get('/csstemplateasyncmodelview/api/read', (data) => {
|
||||
const cssTemplates = data.result.map((row) => ({
|
||||
const cssTemplates = data.result.map(row => ({
|
||||
value: row.template_name,
|
||||
css: row.css,
|
||||
label: row.template_name,
|
||||
@@ -37,6 +32,11 @@ class Controls extends React.PureComponent {
|
||||
this.setState({ cssTemplates });
|
||||
});
|
||||
}
|
||||
refresh() {
|
||||
this.props.dashboard.sliceObjects.forEach((slice) => {
|
||||
slice.render(true);
|
||||
});
|
||||
}
|
||||
changeCss(css) {
|
||||
this.setState({ css });
|
||||
this.props.dashboard.onChange();
|
||||
@@ -99,7 +99,7 @@ class Controls extends React.PureComponent {
|
||||
<Button
|
||||
onClick={() => { window.location = emailLink; }}
|
||||
>
|
||||
<i className="fa fa-envelope"></i>
|
||||
<i className="fa fa-envelope" />
|
||||
</Button>
|
||||
</ButtonGroup>
|
||||
);
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
import React from 'react';
|
||||
|
||||
import ModalTrigger from '../../components/ModalTrigger';
|
||||
import Select from 'react-select';
|
||||
|
||||
import AceEditor from 'react-ace';
|
||||
import 'brace/mode/css';
|
||||
import 'brace/theme/github';
|
||||
|
||||
import ModalTrigger from '../../components/ModalTrigger';
|
||||
|
||||
const propTypes = {
|
||||
initialCss: React.PropTypes.string,
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
import $ from 'jquery';
|
||||
import React, { PropTypes } from 'react';
|
||||
import { Responsive, WidthProvider } from 'react-grid-layout';
|
||||
import $ from 'jquery';
|
||||
|
||||
import SliceCell from './SliceCell';
|
||||
|
||||
require('react-grid-layout/css/styles.css');
|
||||
require('react-resizable/css/styles.css');
|
||||
|
||||
const ResponsiveReactGridLayout = WidthProvider(Responsive);
|
||||
|
||||
const propTypes = {
|
||||
|
||||
@@ -25,7 +25,7 @@ class Header extends React.PureComponent {
|
||||
</h1>
|
||||
</div>
|
||||
<div className="pull-right" style={{ marginTop: '35px' }}>
|
||||
{!this.props.dashboard.standalone_mode &&
|
||||
{!this.props.dashboard.standalone_mode &&
|
||||
<Controls dashboard={dashboard} />
|
||||
}
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import React from 'react';
|
||||
|
||||
import ModalTrigger from '../../components/ModalTrigger';
|
||||
import Select from 'react-select';
|
||||
import ModalTrigger from '../../components/ModalTrigger';
|
||||
|
||||
const propTypes = {
|
||||
triggerNode: React.PropTypes.node.isRequired,
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
const $ = window.$ = require('jquery');
|
||||
|
||||
import React from 'react';
|
||||
import { Button, FormControl, FormGroup, Radio } from 'react-bootstrap';
|
||||
import { getAjaxErrorMsg, showModal } from '../../modules/utils';
|
||||
|
||||
import ModalTrigger from '../../components/ModalTrigger';
|
||||
|
||||
const $ = window.$ = require('jquery');
|
||||
|
||||
const propTypes = {
|
||||
css: React.PropTypes.string,
|
||||
dashboard: React.PropTypes.object.isRequired,
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
import $ from 'jquery';
|
||||
import React, { PropTypes } from 'react';
|
||||
import { BootstrapTable, TableHeaderColumn } from 'react-bootstrap-table';
|
||||
|
||||
import ModalTrigger from '../../components/ModalTrigger';
|
||||
|
||||
require('react-bootstrap-table/css/react-bootstrap-table.css');
|
||||
|
||||
const propTypes = {
|
||||
@@ -39,7 +41,7 @@ class SliceAdder extends React.Component {
|
||||
this.slicesRequest = $.ajax({
|
||||
url: uri,
|
||||
type: 'GET',
|
||||
success: response => {
|
||||
success: (response) => {
|
||||
// Prepare slice data for table
|
||||
const slices = response.result.map(slice => ({
|
||||
id: slice.id,
|
||||
@@ -54,7 +56,7 @@ class SliceAdder extends React.Component {
|
||||
slicesLoaded: true,
|
||||
});
|
||||
},
|
||||
error: error => {
|
||||
error: (error) => {
|
||||
this.errored = true;
|
||||
this.setState({
|
||||
errorMsg: this.props.dashboard.getAjaxErrorMsg(error),
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/* eslint-disable react/no-danger */
|
||||
import React, { PropTypes } from 'react';
|
||||
|
||||
const propTypes = {
|
||||
@@ -62,9 +63,7 @@ function SliceCell({ expandedSlices, removeSlice, slice }) {
|
||||
expandedSlices[String(slice.slice_id)] ? {} : { display: 'none' }
|
||||
}
|
||||
dangerouslySetInnerHTML={{ __html: slice.description_markeddown }}
|
||||
>
|
||||
|
||||
</div>
|
||||
/>
|
||||
<div className="row chart-container">
|
||||
<input type="hidden" value="false" />
|
||||
<div id={'token_' + slice.slice_id} className="token col-md-12">
|
||||
@@ -76,8 +75,7 @@ function SliceCell({ expandedSlices, removeSlice, slice }) {
|
||||
<div
|
||||
id={'con_' + slice.slice_id}
|
||||
className={`slice_container ${slice.form_data.viz_type}`}
|
||||
>
|
||||
</div>
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user