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

Dashboard Builder v2 #4528

Merged
merged 30 commits into from
Jun 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
1a03632
[dashboard builder] Add dir structure for dashboard/v2, simplified He…
williaster Jan 16, 2018
c62af8c
fix rebase error, clean up css organization and use @less vars
williaster Mar 6, 2018
abc3ec0
[dashboard-builder] add top-level tabs + undo-redo (#4626)
williaster Mar 23, 2018
67e78c3
[dashboard builder] static layout + toasts (#4763)
williaster Apr 5, 2018
996b083
[dashboard builder] git mv to src/ post-rebase
williaster Apr 19, 2018
5ff440b
Dashboard builder rebased + linted (#4849)
Apr 19, 2018
2205204
[dashboard builder] improve perf (#4855)
williaster Apr 24, 2018
ff057d8
add sticky tabs + sidepane, better tabs perf, better container hierar…
May 8, 2018
d6dcec2
Markdown for dashboard (#4962)
May 12, 2018
82ab75e
fix dashboard server-side unit tests (#5009)
May 22, 2018
ae37277
Dashboard save button (#4979)
May 23, 2018
a02d858
[dashboard v2] check for default_filters before json_loads-ing them (…
williaster May 23, 2018
439fa14
[dashboard v2] fix bugs from rebase
williaster May 24, 2018
4bee613
[dashboard v2] tests! (#5066)
williaster May 24, 2018
69ab5f7
[dashboard v2] logging updates (#5087)
williaster Jun 1, 2018
a61f6f7
Fix: update slices list when add/remove multiple slices (#5138)
Jun 5, 2018
0e0c768
[dashboard v2] add v1 switch (#5126)
williaster Jun 6, 2018
7ad60ba
add slice from explore view (#5141)
Jun 7, 2018
017e797
Fix dashboard position row data (#5131)
Jun 7, 2018
b1386ab
[dashboard v2] better grid drop ux, fix tab bugs 🐛 (#5151)
williaster Jun 7, 2018
f973397
Fix: Should pass slice_can_edit flag down (#5159)
Jun 7, 2018
0860341
[dash builder fix] combine markdown and slice name, slice picker heig…
Jun 15, 2018
da81674
[fix] new dashboard state (#5213)
Jun 20, 2018
85ae429
[dashboard v2] ui + ux fixes (#5208)
williaster Jun 21, 2018
4a48825
[fix] layout converter fix (#5218)
Jun 21, 2018
00ff778
[dashboard v2] remove webpack-cli, fresh yarn.lock post-rebase
williaster Jun 22, 2018
fe5d9ca
[dashboard v2] lint javascript
williaster Jun 22, 2018
047cb80
[dashboard v2] fix python tests
williaster Jun 22, 2018
c26996a
[Fix] import/export dash in V2 (#5273)
Jun 23, 2018
69621a9
[dashboard v2] add markdown tests (#5275)
williaster Jun 23, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions superset/assets/.eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ node_modules*/*
stylesheets/*
vendor/*
docs/*
src/dashboard/deprecated/*
Binary file modified superset/assets/images/loading.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 16 additions & 6 deletions superset/assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"test": "spec"
},
"scripts": {
"test": "mocha --require ignore-styles --compilers js:babel-core/register --require spec/helpers/browser.js --recursive spec/**/*_spec.*",
"cover": "babel-node node_modules/.bin/babel-istanbul cover _mocha -- --require ignore-styles spec/helpers/browser.js --recursive spec/**/*_spec.*",
"test": "mocha --require ignore-styles --compilers js:babel-core/register --require spec/helpers/browser.js 'spec/**/*_spec.*'",
"cover": "babel-node node_modules/.bin/babel-istanbul cover _mocha -- --require ignore-styles spec/helpers/browser.js 'spec/**/*_spec.*'",
"dev": "NODE_ENV=dev webpack --watch --colors --progress --debug --output-pathinfo --devtool eval-cheap-source-map",
"dev-slow": "NODE_ENV=dev webpack --watch --colors --progress --debug --output-pathinfo --devtool inline-source-map",
"dev-fast": "echo 'dev-fast in now replaced by dev'",
Expand Down Expand Up @@ -41,9 +41,9 @@
},
"homepage": "http://superset.apache.org/",
"dependencies": {
"//": "known issues with react-bootstrap>=0.32",
"@data-ui/event-flow": "^0.0.54",
"@data-ui/sparkline": "^0.0.54",
"@vx/responsive": "0.0.153",
"babel-register": "^6.24.1",
"bootstrap": "^3.3.6",
"bootstrap-slider": "^10.0.0",
Expand All @@ -61,6 +61,7 @@
"deck.gl": "^5.1.4",
"deep-equal": "^1.0.1",
"distributions": "^1.0.0",
"dnd-core": "^2.6.0",
"dompurify": "^1.0.3",
"fastdom": "^1.0.6",
"geojson-extent": "^0.3.2",
Expand All @@ -83,8 +84,9 @@
"parse-iso-duration": "^1.0.0",
"po2json": "^0.4.5",
"prop-types": "^15.6.0",
"re-resizable": "^4.3.1",
"react": "^15.6.2",
"react-ace": "^5.0.1",
"react-ace": "^5.10.0",
"react-addons-css-transition-group": "^15.6.0",
"react-addons-shallow-compare": "^15.4.2",
"react-alert": "^2.3.0",
Expand All @@ -93,31 +95,36 @@
"react-bootstrap-table": "^4.3.1",
"react-color": "^2.13.8",
"react-datetime": "2.14.0",
"react-dnd": "^2.5.4",
"react-dnd-html5-backend": "^2.5.4",
"react-dom": "^15.6.2",
"react-gravatar": "^2.6.1",
"react-grid-layout": "0.16.6",
"react-map-gl": "^3.0.4",
"react-markdown": "^3.3.0",
"react-redux": "^5.0.2",
"react-resizable": "^1.3.3",
"react-search-input": "^0.11.3",
"react-select": "1.2.1",
"react-select-fast-filter-options": "^0.2.1",
"react-sortable-hoc": "^0.8.3",
"react-split-pane": "^0.1.66",
"react-sticky": "^6.0.2",
"react-syntax-highlighter": "^7.0.4",
"react-virtualized": "9.19.1",
"react-virtualized-select": "^2.4.0",
"reactable": "1.0.2",
"redux": "^3.5.2",
"redux-localstorage": "^0.4.1",
"redux-thunk": "^2.1.0",
"redux-undo": "^1.0.0-beta9-9-7",
"shortid": "^2.2.6",
"sprintf-js": "^1.1.1",
"srcdoc-polyfill": "^1.0.0",
"supercluster": "https://github.com/georgeke/supercluster/tarball/ac3492737e7ce98e07af679623aad452373bbc40",
"underscore": "^1.8.3",
"urijs": "^1.18.10",
"viewport-mercator-project": "^5.0.0",
"webpack-cli": "^2.1.4"
"viewport-mercator-project": "^5.0.0"
},
"devDependencies": {
"babel-cli": "^6.14.0",
Expand All @@ -133,8 +140,10 @@
"enzyme": "^2.0.0",
"eslint": "^4.19.0",
"eslint-config-airbnb": "^15.0.1",
"eslint-config-prettier": "^2.9.0",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^5.1.1",
"eslint-plugin-prettier": "^2.6.0",
"eslint-plugin-react": "^7.0.1",
"exports-loader": "^0.7.0",
"extract-text-webpack-plugin": "3.0.2",
Expand All @@ -149,6 +158,7 @@
"less-loader": "^4.0.3",
"mocha": "^3.2.0",
"npm-check-updates": "^2.14.0",
"prettier": "^1.12.1",
"react-addons-test-utils": "^15.6.2",
"react-test-renderer": "^15.6.2",
"redux-mock-store": "^1.2.3",
Expand Down
4 changes: 3 additions & 1 deletion superset/assets/spec/helpers/browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ const exposedProperties = ['window', 'navigator', 'document'];
global.jsdom = jsdom.jsdom;
global.document = global.jsdom('<!doctype html><html><body></body></html>');
global.window = document.defaultView;
global.HTMLElement = window.HTMLElement;

Object.keys(document.defaultView).forEach((property) => {
if (typeof global[property] === 'undefined') {
exposedProperties.push(property);
Expand Down Expand Up @@ -38,5 +40,5 @@ global.sinon.useFakeXMLHttpRequest();

global.window.XMLHttpRequest = global.XMLHttpRequest;
global.window.location = { href: 'about:blank' };
global.window.performance = { now: () => (new Date().getTime()) };
global.window.performance = { now: () => new Date().getTime() };
global.$ = require('jquery')(global.window);
2 changes: 1 addition & 1 deletion superset/assets/spec/javascripts/chart/Chart_spec.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('Chart', () => {
};
const mockedProps = {
...chart,
chartKey: 'slice_223',
id: 223,
containerId: 'slice-container-223',
datasource: {},
formData: {},
Expand Down
33 changes: 33 additions & 0 deletions superset/assets/spec/javascripts/dashboard/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"extends": "prettier",
"plugins": ["prettier"],
"rules": {
"prefer-template": 2,
"new-cap": 2,
"no-restricted-syntax": 2,
"guard-for-in": 2,
"prefer-arrow-callback": 2,
"func-names": 2,
"react/jsx-no-bind": 2,
"no-confusing-arrow": 2,
"jsx-a11y/no-static-element-interactions": 2,
"jsx-a11y/anchor-has-content": 2,
"react/require-default-props": 2,
"no-plusplus": 2,
"no-mixed-operators": 0,
"no-continue": 2,
"no-bitwise": 2,
"no-undef": 2,
"no-multi-assign": 2,
"no-restricted-properties": 2,
"no-prototype-builtins": 2,
"jsx-a11y/href-no-hash": 2,
"class-methods-use-this": 2,
"import/no-named-as-default": 2,
"import/prefer-default-export": 2,
"react/no-unescaped-entities": 2,
"react/no-string-refs": 2,
"react/jsx-indent": 0,
"prettier/prettier": "error"
}
}
4 changes: 4 additions & 0 deletions superset/assets/spec/javascripts/dashboard/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"singleQuote": true,
"trailingComma": "all"
}
182 changes: 0 additions & 182 deletions superset/assets/spec/javascripts/dashboard/Dashboard_spec.jsx

This file was deleted.

Loading