[WIP] 6152 upgrade dependencies to use the v7 named modules (#6153)

* 6152 upgrade dependencies to use the v7 named modules * make version distinguishable from regular releases * #6090 fix hovering on plot line (#6148) * #6137 add commenting feature to newly created cells (#6146) * remove tests notebooks from doc/contents (#6144) * #5834: set protocol version to 5.1 (#6143) * #6093: improve API for Color (#6142) * #6129 add to python easyform demo (#6139) * #6045: add action details to all actions (#6140) * python script to start e2e tests (#6151) * #6103 python API for output containers (#6150) * #6103 python API for output containers * #6103 python API for output containers * #6103 fix NaN in plots * polish doc * add e2e tests for Actions (#6164) * add e2e tests for table Actions (groovy) * add e2e test for actionPerformed (python) * #6149 fix detached plot tooltip (#6160) * #6154 python TableDisplay constructor should handle array of dicts (#6165) * #6154 python TableDisplay constructor should handle array of dicts * add examples to doc * fix #6118 by adding import to grapes demo to correct syntax * #6166 fix plot resizable feature (#6168) * #6155 table in python output container displayed as text (#6167) * #6155 table in python output container displayed as text * add link to python output containers, polish that tutorial * #5980 #5982 #5995 #5996 #5997 Added support for INDEX. (#6161) * #5980 Added support for INDEX. * #5980 Fixed test. * Simplify if statemant. * #5980 Added backward compatibility for customizing styles. * #5980 Setting up default value. * #5980 Rollback backward compatibility. Fixed tests. * update doc to match code * #runAll: prevent receiving new messages before code execution ends (#6169) * #5998 add webpack production build (#6162) * #5998 add webpack production build * #5998 tweak webpack configuration, use build:prod by default * #6152 provide correct version number to widgets * bump version * #6152 update widgets, remove duplicated handlers * bump version to 0.6.3-widgets7b * #5268 update the version const name to more semantic one * #6152 add single point of true for ipywidgets, use * for version * #6152 fix tableDisplay copy to clipboard in embedded lib
twosigma · Nov 21, 2017 · 634f0c5 · 634f0c5
1 parent 6574206
commit 634f0c5
Show file tree

Hide file tree

Showing 30 changed files with 171 additions and 73 deletions.
diff --git a/beakerx/js/package.json b/beakerx/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "beakerx",
-  "version": "0.8.0",
+  "version": "0.6.3-widgets7b",
   "description": "BeakerX: Beaker Extensions for Jupyter",
   "author": "Two Sigma Open Source, LLC",
   "main": "src/index.js",

diff --git a/beakerx/js/src/CyclingDisplayBox.js b/beakerx/js/src/CyclingDisplayBox.js
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-var widgets = require('jupyter-js-widgets');
+var widgets = require('./widgets');
 var _ = require('underscore');
 
 var interval = undefined;
@@ -26,8 +26,8 @@ var CyclingDisplayBoxModel = widgets.BoxModel.extend({
   _view_name : 'CyclingDisplayBoxView',
   _model_module : 'beakerx',
   _view_module : 'beakerx',
-  _model_module_version: '*',
-  _view_module_version: '*'
+  _model_module_version: BEAKERX_MODULE_VERSION,
+  _view_module_version: BEAKERX_MODULE_VERSION
 });
 
 var CyclingDisplayBoxView = widgets.BoxView.extend({

diff --git a/beakerx/js/src/EasyForm.js b/beakerx/js/src/EasyForm.js
@@ -15,7 +15,7 @@
  */
 
 var ENTER_KEY_CODE = 13;
-var widgets = require('jupyter-js-widgets');
+var widgets = require('./widgets');
 var _ = require('underscore');
 
 var selectMultipleWidget = require('./easyForm/selectMultipleWidget');
@@ -26,13 +26,6 @@ var textWidget = require('./easyForm/textWidget').default;
 var TextareaWidget = require('./easyForm/TextareaWidget').default;
 var checkboxWidget = require('./easyForm/checkboxWidget').default;
 
-widgets.TextView.prototype.handleEnterKeyPress = function() {
-  if (e.keyCode == 13) {
-    this.send({ event: 'submit' });
-    e.preventDefault();
-  }
-};
-
 require('./easyForm/css/jupyter-easyform.scss');
 require('flatpickr/dist/flatpickr.css');
 require('jquery-ui/themes/base/all.css');
@@ -46,8 +39,8 @@ var EasyFormModel = widgets.DOMWidgetModel.extend({
       _view_name: 'EasyFormView',
       _model_module: 'beakerx',
       _view_module: 'beakerx',
-      _model_module_version: '*',
-      _view_module_version: '*',
+      _model_module_version: BEAKERX_MODULE_VERSION,
+      _view_module_version: BEAKERX_MODULE_VERSION,
       children: []
     });
   }

diff --git a/beakerx/js/src/GridView.js b/beakerx/js/src/GridView.js
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-var widgets = require('jupyter-js-widgets');
+var widgets = require('./widgets');
 var _ = require('underscore');
 
 require('./gridView/grid-view.scss');
@@ -24,8 +24,8 @@ var GridViewModel = widgets.VBoxModel.extend({
   _view_name : 'GridView',
   _model_module : 'beakerx',
   _view_module : 'beakerx',
-  _model_module_version: '*',
-  _view_module_version: '*',
+  _model_module_version: BEAKERX_MODULE_VERSION,
+  _view_module_version: BEAKERX_MODULE_VERSION
 });
 
 var GridView = widgets.VBoxView.extend({

diff --git a/beakerx/js/src/HTMLPre.ts b/beakerx/js/src/HTMLPre.ts
@@ -15,7 +15,7 @@
  */
 
 declare function require(moduleName: string): any;
-const widgets = require('jupyter-js-widgets');
+const widgets = require('./widgets');
 
 class HTMLPreModel extends widgets.StringModel {
   defaults() {
@@ -24,7 +24,9 @@ class HTMLPreModel extends widgets.StringModel {
       _view_name: "HTMLPreView",
       _model_name: "HTMLPreModel",
       _model_module: 'beakerx',
-      _view_module: 'beakerx'
+      _view_module: 'beakerx',
+      _model_module_version: BEAKERX_MODULE_VERSION,
+      _view_module_version: BEAKERX_MODULE_VERSION
     };
   }
 }

diff --git a/beakerx/js/src/Plot.js b/beakerx/js/src/Plot.js
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-var widgets = require('jupyter-js-widgets');
+var widgets = require('./widgets');
 var _ = require('underscore');
 var d3 = require('d3');
 
@@ -33,8 +33,8 @@ var PlotModel = widgets.DOMWidgetModel.extend({
       _view_name : 'PlotView',
       _model_module : 'beakerx',
       _view_module : 'beakerx',
-      _model_module_version: '*',
-      _view_module_version: '*'
+      _model_module_version: BEAKERX_MODULE_VERSION,
+      _view_module_version: BEAKERX_MODULE_VERSION
     });
   }
 });

diff --git a/beakerx/js/src/TabView.js b/beakerx/js/src/TabView.js
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-var widgets = require('jupyter-js-widgets');
+var widgets = require('./widgets');
 var _ = require('underscore');
 
 var TabModel = widgets.TabModel.extend({
   _model_name : 'TabModel',
   _view_name : 'TabView',
   _model_module : 'beakerx',
   _view_module : 'beakerx',
-  _model_module_version: '*',
-  _view_module_version: '*'
+  _model_module_version: BEAKERX_MODULE_VERSION,
+  _view_module_version: BEAKERX_MODULE_VERSION
 });
 
 var TabView = widgets.TabView.extend({

diff --git a/beakerx/js/src/TableDisplay.js b/beakerx/js/src/TableDisplay.js
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-var widgets = require('jupyter-js-widgets');
+var widgets = require('./widgets');
 var _ = require('underscore');
 var $ = require('jquery');
 
@@ -34,8 +34,8 @@ var TableDisplayModel = widgets.DOMWidgetModel.extend({
       _view_name: 'TableDisplayView',
       _model_module: 'beakerx',
       _view_module: 'beakerx',
-      _model_module_version: '*',
-      _view_module_version: '*'
+      _model_module_version: BEAKERX_MODULE_VERSION,
+      _view_module_version: BEAKERX_MODULE_VERSION
     });
   }
 });

diff --git a/beakerx/js/src/easyForm/TextareaWidget.ts b/beakerx/js/src/easyForm/TextareaWidget.ts
@@ -15,7 +15,7 @@
  */
 
 declare function require(moduleName: string): any;
-const widgets = require('jupyter-js-widgets');
+const widgets = require('../widgets');
 
 import { TEXT_INPUT_WIDTH_UNIT } from './textWidget';
 
@@ -28,7 +28,9 @@ class TextareaModel extends widgets.TextareaModel {
       _view_name: "TextareaView",
       _model_name: "TextareaModel",
       _model_module: 'beakerx',
-      _view_module: 'beakerx'
+      _view_module: 'beakerx',
+      _model_module_version: BEAKERX_MODULE_VERSION,
+      _view_module_version: BEAKERX_MODULE_VERSION
     };
   }
 }

diff --git a/beakerx/js/src/easyForm/checkboxWidget.ts b/beakerx/js/src/easyForm/checkboxWidget.ts
@@ -15,7 +15,7 @@
  */
 
 declare function require(moduleName: string): any;
-const widgets = require('jupyter-js-widgets');
+const widgets = require('../widgets');
 
 class CheckboxModel extends widgets.CheckboxModel {
   defaults() {
@@ -24,7 +24,9 @@ class CheckboxModel extends widgets.CheckboxModel {
       _view_name: "CheckboxView",
       _model_name: "CheckboxModel",
       _model_module: 'beakerx',
-      _view_module: 'beakerx'
+      _view_module: 'beakerx',
+      _model_module_version: BEAKERX_MODULE_VERSION,
+      _view_module_version: BEAKERX_MODULE_VERSION
     };
   }
 }

diff --git a/beakerx/js/src/easyForm/comboBoxWidget.ts b/beakerx/js/src/easyForm/comboBoxWidget.ts
@@ -15,7 +15,7 @@
  */
 
 declare function require(moduleName: string): any;
-const widgets = require('jupyter-js-widgets');
+const widgets = require('../widgets');
 const comboBox = require('../comboBox/jQueryComboBox');
 
 import $ from 'jquery';
@@ -27,7 +27,9 @@ class ComboBoxModel extends widgets.SelectModel {
       _view_name: "ComboBoxView",
       _model_name: "ComboBoxModel",
       _model_module: 'beakerx',
-      _view_module: 'beakerx'
+      _view_module: 'beakerx',
+      _model_module_version: BEAKERX_MODULE_VERSION,
+      _view_module_version: BEAKERX_MODULE_VERSION
     };
   }
 }

diff --git a/beakerx/js/src/easyForm/datePickerWidget.js b/beakerx/js/src/easyForm/datePickerWidget.js
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-var widgets = require('jupyter-js-widgets');
+var widgets = require('../widgets');
 var _ = require('underscore');
 var moment = require('moment');
 
@@ -26,7 +26,9 @@ var DatePickerModel = widgets.StringModel.extend({
       _view_name: "DatePickerView",
       _model_name: "DatePickerModel",
       _model_module: 'beakerx',
-      _view_module: 'beakerx'
+      _view_module: 'beakerx',
+      _model_module_version: BEAKERX_MODULE_VERSION,
+      _view_module_version: BEAKERX_MODULE_VERSION
     });
   }
 });

diff --git a/beakerx/js/src/easyForm/selectMultipleSingleWidget.js b/beakerx/js/src/easyForm/selectMultipleSingleWidget.js
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-var widgets = require('jupyter-js-widgets');
+var widgets = require('../widgets');
 var _ = require('underscore');
 
 var SelectMultipleSingleModel = widgets.SelectModel.extend({
@@ -23,7 +23,9 @@ var SelectMultipleSingleModel = widgets.SelectModel.extend({
       _view_name: "SelectMultipleSingleView",
       _model_name: "SelectMultipleSingleModel",
       _model_module: 'beakerx',
-      _view_module: 'beakerx'
+      _view_module: 'beakerx',
+      _model_module_version: BEAKERX_MODULE_VERSION,
+      _view_module_version: BEAKERX_MODULE_VERSION
     });
   }
 });

diff --git a/beakerx/js/src/easyForm/selectMultipleWidget.js b/beakerx/js/src/easyForm/selectMultipleWidget.js
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-var widgets = require('jupyter-js-widgets');
+var widgets = require('../widgets');
 var _ = require('underscore');
 
 var SelectMultipleModel = widgets.SelectMultipleModel.extend({
@@ -23,7 +23,9 @@ var SelectMultipleModel = widgets.SelectMultipleModel.extend({
       _view_name: "SelectMultipleView",
       _model_name: "SelectMultipleModel",
       _model_module: 'beakerx',
-      _view_module: 'beakerx'
+      _view_module: 'beakerx',
+      _model_module_version: BEAKERX_MODULE_VERSION,
+      _view_module_version: BEAKERX_MODULE_VERSION
     });
   }
 });

diff --git a/beakerx/js/src/easyForm/textWidget.ts b/beakerx/js/src/easyForm/textWidget.ts
@@ -15,7 +15,7 @@
  */
 
 declare function require(moduleName: string): any;
-const widgets = require('jupyter-js-widgets');
+const widgets = require('../widgets');
 
 export const TEXT_INPUT_WIDTH_UNIT = 'px';
 
@@ -25,8 +25,10 @@ class TextModel extends widgets.TextModel {
       ...super.defaults(),
       _view_name: "TextView",
       _model_name: "TextModel",
-      _model_module: 'beakerx',
-      _view_module: 'beakerx'
+      _model_module: "beakerx",
+      _view_module: "beakerx",
+      _model_module_version: BEAKERX_MODULE_VERSION,
+      _view_module_version: BEAKERX_MODULE_VERSION
     };
   }
 }
@@ -39,6 +41,13 @@ class TextView extends widgets.TextView {
     }
   }
 
+  handleEnterKeyPress(e) {
+    if (e.keyCode == 13) {
+      this.send({ event: 'submit' });
+      e.preventDefault();
+    }
+  }
+
   render() {
     super.render.call(this);
 

diff --git a/beakerx/js/src/extension.js b/beakerx/js/src/extension.js
@@ -24,7 +24,9 @@ if (window.require) {
         map: {
             "*" : {
                 "beakerx": "nbextensions/beakerx/index",
-                "jupyter-js-widgets": "nbextensions/jupyter-js-widgets/extension"
+                "jupyter-js-widgets": "nbextensions/jupyter-js-widgets/extension",
+                "@jupyter-widgets/base": "nbextensions/jupyter-js-widgets/extension",
+                "@jupyter-widgets/controls": "nbextensions/jupyter-js-widgets/extension"
             }
         }
     });

diff --git a/beakerx/js/src/global.env.ts b/beakerx/js/src/global.env.ts
@@ -0,0 +1,5 @@
+declare var BEAKERX_MODULE_VERSION: string;
+
+interface GlobalEnvironment {
+  BEAKERX_MODULE_VERSION;
+}
diff --git a/beakerx/js/src/tableDisplay/css/datatables.scss b/beakerx/js/src/tableDisplay/css/datatables.scss
@@ -20,8 +20,6 @@ $border-color: #D4D0D0;
 $highlight-blue: #39a9ed;
 
 .beaker-table-display {
-  overflow: visible;
-
   :focus {
     outline: none;
   }

diff --git a/beakerx/js/src/tableDisplay/tableHeaderMenu/HeaderMenu.ts b/beakerx/js/src/tableDisplay/tableHeaderMenu/HeaderMenu.ts
@@ -50,6 +50,7 @@ export default abstract class HeaderMenu {
     $(document.body).off('click.table-headermenu');
     $(document).off('keydown.keyTable', this.handleKeydownEvent);
     $(this.menu.node).off('keydown.HeaderMenu', '.dropdown-menu-search input', this.handleKeydownEvent)
+    this.menu.dispose();
   }
 
   protected getMenuPosition($trigger: any) {