Merge pull request #879 from metabase/upgrade_frontend_deps

Upgrade frontend dependencies + misc cleanup

package.json

@@ -9,14 +9,13 @@
     "node": "0.10.25"
   },
   "dependencies": {
-    "ace-builds": "git://github.com/ajaxorg/ace-builds",
+    "ace-builds": "git://github.com/ajaxorg/ace-builds#v1.2.0",
     "angular": "1.2.28",
     "angular-animate": "1.2.28",
     "angular-cookie": "git://github.com/ivpusic/angular-cookie#v4.0.6",
     "angular-cookies": "1.2.28",
     "angular-gridster": "0.11.7",
     "angular-http-auth": "1.2.1",
-    "angular-mocks": "1.2.28",
     "angular-readable-time": "git://github.com/wildlyinaccurate/angular-readable-time#0.1.1",
     "angular-resource": "1.2.28",
     "angular-route": "1.2.28",
@@ -24,26 +23,23 @@
     "angular-ui-ace": "0.2.3",
     "angular-ui-bootstrap": "^0.12.1",
     "angular-xeditable": "git://github.com/vitalets/angular-xeditable#0.1.9",
-    "angularytics": "0.3.0",
     "classnames": "^2.1.3",
-    "crossfilter": "1.3.11",
-    "d3": "3.5.3",
+    "crossfilter": "^1.3.12",
+    "d3": "^3.5.6",
     "d3-tip": "^0.6.7",
-    "dc": "2.0.0-beta.1",
-    "fixed-data-table": "0.2.0",
-    "humanize-plus": "1.5.0",
-    "inflection": "1.7.1",
-    "jquery": "2.1.4",
-    "moment": "2.9.0",
-    "ng-sortable": "1.2.0",
-    "ngreact": "0.1.5",
-    "react": "0.12.2",
-    "react-onclickoutside": "0.2.4",
-    "tether": "0.6.5",
-    "underscore": "1.8.3"
+    "dc": "^2.0.0-beta.14",
+    "fixed-data-table": "^0.4.2",
+    "humanize-plus": "^1.5.0",
+    "inflection": "^1.7.1",
+    "jquery": "^2.1.4",
+    "moment": "^2.10.6",
+    "react": "^0.13.3",
+    "react-onclickoutside": "^0.2.5",
+    "tether": "^1.1.0",
+    "underscore": "^1.8.3"
   },
   "devDependencies": {
-    "angular-mocks": "^1.2.28",
+    "angular-mocks": "1.2.28",
     "babel": "^5.4.7",
     "babel-core": "^5.4.7",
     "babel-eslint": "^3.1.14",
@@ -58,11 +54,11 @@
     "html-webpack-plugin": "git://github.com/tlrobinson/html-webpack-plugin.git#562acca0363224f156c0bcc87d064a1e2f72611c",
     "istanbul-instrumenter-loader": "^0.1.3",
     "jasmine-core": "^2.3.4",
-    "karma": "^0.12.36",
+    "karma": "^0.13.9",
     "karma-chrome-launcher": "^0.2.0",
     "karma-coverage": "^0.4.2",
     "karma-jasmine": "^0.3.5",
-    "karma-webpack": "^1.5.1",
+    "karma-webpack": "^1.7.0",
     "ng-annotate-webpack-plugin": "^0.1.2",
     "node-libs-browser": "^0.5.2",
     "protractor": "^2.1.0",

resources/frontend_client/app/admin/metadata/components/Select.react.js

@@ -62,7 +62,8 @@ export default React.createClass({
         var tetherOptions = {
             attachment: 'top center',
             targetAttachment: 'bottom center',
-            targetOffset: '5px 0'
+            targetOffset: '5px 0',
+            constraints: [{ to: 'window', attachment: 'together', pin: ['top', 'bottom']}]
         };
 
         return (

resources/frontend_client/app/app.js

@@ -10,7 +10,6 @@ var Corvus = angular.module('corvus', [
     'xeditable', // inplace editing capabilities
     'ui.bootstrap', // bootstrap LIKE widgets via angular directives
     'gridster', // used for dashboard grids
-    'ui.sortable',
     'readableTime',
     'corvus.auth',
     'corvus.filters',

resources/frontend_client/app/components/dashboard/dashboard.css

@@ -108,12 +108,3 @@
 .gridster-mobile .Dash-card {
   position: relative;
 }
-
-/* this class is applied when .sortable is applied */
-.sortable-placeholder {
-  float: left; /* can't use util float because element is added dynamically */
-  padding-left: 14px;
-  padding-right: 14px;
-  border: 2px solid #999;
-  min-width: 33.3333333%;
-}

resources/frontend_client/app/css/external/ng_sortable.css

-.as-sortable-item {
-    background-color: #ffffff;
-}
-
-.as-sortable-placeholder {
-    border: 1px dashed darkgrey;
-    background-color: #dbdbdb;
-}
-
-.as-sortable-drag {
-    opacity: .8;
-}
\ No newline at end of file

resources/frontend_client/app/query_builder/icon.react.js

@@ -2,15 +2,13 @@
 
 import { loadIcon } from 'metabase/icon_paths';
 
-export default React.createClass({
-    displayName: 'Icon',
-    render: function () {
+export default class Icon extends React.Component {
+    render() {
         var icon = loadIcon(this.props.name);
-
         if (icon.svg) {
             return (<svg {... icon.attrs} {... this.props} dangerouslySetInnerHTML={{__html: icon.svg}}></svg>);
         } else {
             return (<svg {... icon.attrs} {... this.props}><path d={icon.path} /></svg>);
         }
     }
-});
+}

resources/frontend_client/vendor.css

 /* angular 3rd-party */
 @import 'angular-xeditable/dist/css/xeditable.css';
 @import 'angular-gridster/dist/angular-gridster.min.css';
-@import 'ng-sortable/dist/ng-sortable.css';
 
 /* d3 */
 @import 'dc/dc.css';

resources/frontend_client/vendor.js

@@ -19,8 +19,6 @@ import 'angular-http-auth'; // currently pulled from unofficial fork: https://gi
 import 'angular-readable-time';
 import 'angular-ui-bootstrap';
 import 'angular-xeditable';
-import 'ng-sortable';
-import 'angularytics';
 
 // ace:
 import 'angular-ui-ace';

webpack.config.js

@@ -82,8 +82,6 @@ module.exports = {
             'angular-http-auth':    __dirname + '/node_modules/angular-http-auth/src/http-auth-interceptor.js',
             'angular-readable-time':__dirname + '/node_modules/angular-readable-time/angular-readable-time.min.js',
             'angular-xeditable':    __dirname + '/node_modules/angular-xeditable/dist/js/xeditable.min.js',
-            'ng-sortable':          __dirname + '/node_modules/ng-sortable/dist/ng-sortable.min.js',
-            'angularytics':         __dirname + '/node_modules/angularytics/dist/angularytics.min.js',
             'angular-ui-ace':       __dirname + '/node_modules/angular-ui-ace/src/ui-ace.js',
             // ace
             'ace/ace':              __dirname + '/node_modules/ace-builds/src-min-noconflict/ace.js',
@@ -96,7 +94,7 @@ module.exports = {
             'fixed-data-table':     __dirname + '/node_modules/fixed-data-table/dist/fixed-data-table.min.js',
             // misc
             'moment':               __dirname + '/node_modules/moment/min/moment.min.js',
-            'tether':               __dirname + '/node_modules/tether/tether.min.js',
+            'tether':               __dirname + '/node_modules/tether/dist/js/tether.min.js',
             'underscore':           __dirname + '/node_modules/underscore/underscore-min.js',
             'jquery':               __dirname + '/node_modules/jquery/dist/jquery.min.js',
             'd3':                   __dirname + '/node_modules/d3/d3.min.js',