#6214 rename BeakerXTreeWidget => TreeWidget; introduce isLab and Cod…

…eCell options; move BeakerXApi creation into TreeWidget

js/lab/src/tree.ts

@@ -22,8 +22,7 @@ import { JSONExt } from "@phosphor/coreutils";
 import { PageConfig } from "@jupyterlab/coreutils";
 
 const BeakerXTreeLib = require("../lib/tree.js").default;
-const BeakerXTreeWidget = BeakerXTreeLib.BeakerXTreeWidget;
-const BeakerXApi = BeakerXTreeLib.BeakerXApi;
+const TreeWidget = BeakerXTreeLib.TreeWidget;
 
 function activate(app: JupyterLab, palette: ICommandPalette, restorer: ILayoutRestorer) {
   let widget:any;
@@ -34,9 +33,12 @@ function activate(app: JupyterLab, palette: ICommandPalette, restorer: ILayoutRe
     label: 'BeakerX Options',
     execute: () => {
       if (!widget) {
-        widget = new BeakerXTreeWidget(
-          new BeakerXApi(PageConfig.getBaseUrl())
-        );
+        let options = {
+          baseUrl: PageConfig.getBaseUrl(),
+          isLab: true,
+          CodeCell: null,
+        };
+        widget = new TreeWidget(options);
         widget.update();
       }
       if (!tracker.has(widget)) {

js/notebook/src/tree-lab.ts

@@ -1,7 +1,21 @@
-import BeakerXTreeWidget from './tree/TreeWidget';
-import BeakerXApi from "./tree/BeakerXApi";
+/*
+ *  Copyright 2017 TWO SIGMA OPEN SOURCE, LLC
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+import TreeWidget from "./tree/TreeWidget";
 
 export default {
-  BeakerXTreeWidget: BeakerXTreeWidget,
-  BeakerXApi: BeakerXApi,
+  TreeWidget: TreeWidget,
 }

js/notebook/src/tree.js

@@ -27,10 +27,13 @@ define([
   var Widget = require('@phosphor/widgets').Widget;
 
   function load() {
-    var base_url = (Jupyter.notebook_list || Jupyter.notebook).base_url;
-    var BeakerXTreeWidget = require('./tree/TreeWidget').default;
-    var BeakerxApi = require('./tree/BeakerXApi').default;
-    var bxWidget = new BeakerXTreeWidget(new BeakerxApi(base_url));
+    var TreeWidget = require('./tree/TreeWidget').default;
+    var options = {
+      baseUrl: (Jupyter.notebook_list || Jupyter.notebook).base_url,
+      isLab: false,
+      CodeCell: Jupyter.CodeCell,
+    };
+    var bxWidget = new TreeWidget(options);
 
     Widget.attach(bxWidget, $('.tab-content').get(0));
     $('#tabs').append(