@deephaven/console 0.15.1-beta.2 → 0.15.1-beta.4

package/dist/Console.js

@@ -8,15 +8,14 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * Console display for use in the Iris environment.
  */
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { ContextActions } from '@deephaven/components';
 import { vsCheck } from '@deephaven/icons';
 import classNames from 'classnames';
 import memoize from 'memoize-one';
 import throttle from 'lodash.throttle';
-import dh, { PropTypes as APIPropTypes } from '@deephaven/jsapi-shim';
+import dh from '@deephaven/jsapi-shim';
 import Log from '@deephaven/log';
-import { Pending } from '@deephaven/utils';
+import { assertNotNull, Pending, PromiseUtils } from '@deephaven/utils';
 import ConsoleHistory from "./console-history/ConsoleHistory.js";
 import SHORTCUTS from "./ConsoleShortcuts.js";
 import LogLevel from "./log/LogLevel.js";
@@ -25,7 +24,6 @@ import CsvOverlay from "./csv/CsvOverlay.js";
 import CsvInputBar from "./csv/CsvInputBar.js";
 import "./Console.css";
 import ConsoleStatusBar from "./ConsoleStatusBar.js";
-import StoragePropTypes from "./StoragePropTypes.js";
 var log = Log.module('Console');
 var DEFAULT_SETTINGS = {
   isAutoLaunchPanelsEnabled: true,
@@ -35,16 +33,16 @@ var DEFAULT_SETTINGS = {
 export class Console extends PureComponent {
   /**
    * Check if the provided log level is an error type
-   * @param {LogLevel} logLevel The LogLevel being checked
-   * @returns {boolean} true if the log level is an error level log
+   * @param logLevel The LogLevel being checked
+   * @returns true if the log level is an error level log
    */
   static isErrorLevel(logLevel) {
     return logLevel === LogLevel.STDERR || logLevel === LogLevel.ERROR || logLevel === LogLevel.FATAL;
   }
   /**
    * Check if the provided log level is output level
-   * @param {LogLevel} logLevel The LogLevel being checked
-   * @returns {boolean} true if the log level should be output to the console
+   * @param logLevel The LogLevel being checked
+   * @return true if the log level should be output to the console
    */
 
 
@@ -57,6 +55,33 @@ export class Console extends PureComponent {
   constructor(props) {
     super(props);
 
+    _defineProperty(this, "cancelListener", void 0);
+
+    _defineProperty(this, "consolePane", void 0);
+
+    _defineProperty(this, "consoleInput", void 0);
+
+    _defineProperty(this, "consoleHistoryScrollPane", void 0);
+
+    _defineProperty(this, "pending", void 0);
+
+    _defineProperty(this, "queuedLogMessages", void 0);
+
+    _defineProperty(this, "processLogMessageQueue", throttle(() => {
+      this.scrollConsoleHistoryToBottom();
+      this.setState(state => {
+        log.debug2('processLogMessageQueue', this.queuedLogMessages.length, ' items');
+        var {
+          consoleHistory
+        } = state;
+        consoleHistory = consoleHistory.concat(this.queuedLogMessages);
+        this.queuedLogMessages = [];
+        return {
+          consoleHistory
+        };
+      });
+    }, Console.LOG_THROTTLE));
+
     _defineProperty(this, "getObjects", memoize(objectMap => [...objectMap.values()]));
 
     _defineProperty(this, "getContextActions", memoize(actions => [...actions, {
@@ -78,9 +103,9 @@ export class Console extends PureComponent {
     this.handleToggleAutoLaunchPanels = this.handleToggleAutoLaunchPanels.bind(this);
     this.handleToggleClosePanelsOnDisconnect = this.handleToggleClosePanelsOnDisconnect.bind(this);
     this.handleTogglePrintStdout = this.handleTogglePrintStdout.bind(this);
-    this.processLogMessageQueue = throttle(this.processLogMessageQueue.bind(this), Console.LOG_THROTTLE);
     this.handleUploadCsv = this.handleUploadCsv.bind(this);
     this.handleHideCsv = this.handleHideCsv.bind(this);
+    this.handleCsvFileCanceled = this.handleCsvFileCanceled.bind(this);
     this.handleCsvFileOpened = this.handleCsvFileOpened.bind(this);
     this.handleCsvPaste = this.handleCsvPaste.bind(this);
     this.handleDragEnter = this.handleDragEnter.bind(this);
@@ -90,7 +115,6 @@ export class Console extends PureComponent {
     this.handleCsvUpdate = this.handleCsvUpdate.bind(this);
     this.handleCsvError = this.handleCsvError.bind(this);
     this.handleCsvInProgress = this.handleCsvInProgress.bind(this);
-    this.cancelListener = null;
     this.consolePane = /*#__PURE__*/React.createRef();
     this.consoleInput = /*#__PURE__*/React.createRef();
     this.consoleHistoryScrollPane = /*#__PURE__*/React.createRef();
@@ -159,14 +183,16 @@ export class Console extends PureComponent {
   deinitConsoleLogging() {
     if (this.cancelListener != null) {
       this.cancelListener();
-      this.cancelListener = null;
+      this.cancelListener = undefined;
     }
   }
 
   handleClearShortcut(event) {
+    var _this$consoleInput$cu;
+
     event.preventDefault();
     event.stopPropagation();
-    this.consoleInput.current.clear();
+    (_this$consoleInput$cu = this.consoleInput.current) === null || _this$consoleInput$cu === void 0 ? void 0 : _this$consoleInput$cu.clear();
   }
 
   handleCommandStarted(event) {
@@ -177,10 +203,8 @@ export class Console extends PureComponent {
     var wrappedResult = this.pending.add(result);
     var historyItem = {
       command: code,
-      result: null,
       disabledObjects: [],
       startTime: Date.now(),
-      endTime: null,
       cancelResult: () => {
         result.cancel();
       },
@@ -193,9 +217,7 @@ export class Console extends PureComponent {
     } = this.props;
     var workspaceItemPromise = commandHistoryStorage.addItem(language, scope, code, {
       command: code,
-      startTime: new Date().toJSON(),
-      endTime: null,
-      result: null
+      startTime: new Date().toJSON()
     });
     workspaceItemPromise.catch(err => {
       log.debug('Error adding workspace item', err);
@@ -214,8 +236,8 @@ export class Console extends PureComponent {
 
   handleCommandResult(result, historyItemParam, workspaceItemPromise) {
     var historyItem = historyItemParam;
-    historyItem.wrappedResult = null;
-    historyItem.cancelResult = null;
+    historyItem.wrappedResult = undefined;
+    historyItem.cancelResult = undefined;
 
     if (!result) {
       return;
@@ -233,10 +255,10 @@ export class Console extends PureComponent {
 
   handleCommandError(error, historyItemParam, workspaceItemPromise) {
     var historyItem = historyItemParam;
-    historyItem.wrappedResult = null;
-    historyItem.cancelResult = null;
+    historyItem.wrappedResult = undefined;
+    historyItem.cancelResult = undefined;
 
-    if (error && error.isCanceled) {
+    if (PromiseUtils.isCanceled(error)) {
       log.debug('Called handleCommandError on a cancelled promise result');
       return;
     }
@@ -291,28 +313,13 @@ export class Console extends PureComponent {
     }
 
     var historyItem = {
-      command: null,
+      command: undefined,
       result
     };
     this.queuedLogMessages.push(historyItem);
     this.processLogMessageQueue();
   }
 
-  processLogMessageQueue() {
-    this.scrollConsoleHistoryToBottom();
-    this.setState(state => {
-      log.debug2('processLogMessageQueue', this.queuedLogMessages.length, ' items');
-      var {
-        consoleHistory
-      } = state;
-      consoleHistory = consoleHistory.concat(this.queuedLogMessages);
-      this.queuedLogMessages = [];
-      return {
-        consoleHistory
-      };
-    });
-  }
-
   openUpdatedItems(changes) {
     var {
       isAutoLaunchPanelsEnabled
@@ -361,9 +368,11 @@ export class Console extends PureComponent {
   }
 
   updateKnownObjects(historyItem) {
-    var {
-      changes
-    } = historyItem.result;
+    var changes;
+
+    if (historyItem.result) {
+      changes = historyItem.result.changes;
+    }
 
     if (!changes || (!changes.created || changes.created.length === 0) && (!changes.updated || changes.updated.length === 0) && (!changes.removed || changes.removed.length === 0)) {
       log.debug2('updateKnownObjects no changes');
@@ -371,6 +380,8 @@ export class Console extends PureComponent {
     }
 
     this.setState(state => {
+      var _changes, _changes2, _changes3;
+
       var history = state.consoleHistory.concat();
       var itemIndex = history.lastIndexOf(historyItem);
 
@@ -385,36 +396,39 @@ export class Console extends PureComponent {
       var disableOldObject = function disableOldObject(object) {
         var isRemoved = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
         var {
-          name
+          title
         } = object;
-        var oldIndex = objectHistoryMap.get(name); // oldIndex can be -1 if a object is active but doesn't have a command in consoleHistory
+        assertNotNull(title);
+        var oldIndex = objectHistoryMap.get(title); // oldIndex can be -1 if a object is active but doesn't have a command in consoleHistory
         // this can happen after clearing the console using 'clear' or 'cls' command
 
-        if (oldIndex >= 0) {
+        if (oldIndex != null && oldIndex >= 0) {
+          var _history$oldIndex$dis;
+
           // disable outdated object variable in the old consoleHistory item
-          history[oldIndex].disabledObjects = history[oldIndex].disabledObjects.concat(name);
-          history[oldIndex] = _objectSpread({}, history[oldIndex]);
+          history[oldIndex].disabledObjects = [...((_history$oldIndex$dis = history[oldIndex].disabledObjects) !== null && _history$oldIndex$dis !== void 0 ? _history$oldIndex$dis : []), title];
         }
 
-        objectHistoryMap.set(name, itemIndex);
+        objectHistoryMap.set(title, itemIndex);
 
         if (isRemoved) {
-          objectMap.delete(name);
+          objectMap.delete(title);
         } else {
-          objectMap.set(name, object);
+          objectMap.set(title, object);
         }
       };
 
-      changes.updated.forEach(object => disableOldObject(object));
-      changes.removed.forEach(object => disableOldObject(object, true)); // Created objects have to be processed after removed
+      (_changes = changes) === null || _changes === void 0 ? void 0 : _changes.updated.forEach(object => disableOldObject(object));
+      (_changes2 = changes) === null || _changes2 === void 0 ? void 0 : _changes2.removed.forEach(object => disableOldObject(object, true)); // Created objects have to be processed after removed
       // in case the same object name is present in both removed and created
 
-      changes.created.forEach(object => {
+      (_changes3 = changes) === null || _changes3 === void 0 ? void 0 : _changes3.created.forEach(object => {
         var {
-          name
+          title
         } = object;
-        objectHistoryMap.set(name, itemIndex);
-        objectMap.set(name, object);
+        assertNotNull(title);
+        objectHistoryMap.set(title, itemIndex);
+        objectMap.set(title, object);
       });
       return {
         objectHistoryMap,
@@ -434,8 +448,8 @@ export class Console extends PureComponent {
   }
   /**
    * Updates an existing workspace CommandHistoryItem
-   * @param {object} result The result to store with the history item. Could be empty object for success
-   * @param {Promise<object>} workspaceItemPromise The workspace data row promise for the workspace item to be updated
+   * @param result The result to store with the history item. Could be empty object for success
+   * @param workspaceItemPromise The workspace data row promise for the workspace item to be updated
    */
 
 
@@ -465,6 +479,7 @@ export class Console extends PureComponent {
   scrollConsoleHistoryToBottom() {
     var force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     var pane = this.consoleHistoryScrollPane.current;
+    assertNotNull(pane);
 
     if (!force && pane.scrollTop < pane.scrollHeight - pane.offsetHeight) {
       return;
@@ -477,6 +492,7 @@ export class Console extends PureComponent {
 
   handleScrollPaneScroll() {
     var scrollPane = this.consoleHistoryScrollPane.current;
+    assertNotNull(scrollPane);
 
     if (scrollPane.scrollTop > 0 && scrollPane.scrollHeight > scrollPane.clientHeight) {
       this.setState({
@@ -525,6 +541,13 @@ export class Console extends PureComponent {
     });
   }
 
+  handleCsvFileCanceled() {
+    this.setState({
+      csvFile: null,
+      csvPaste: null
+    });
+  }
+
   handleCsvFileOpened(file) {
     this.setState({
       csvFile: file,
@@ -575,7 +598,7 @@ export class Console extends PureComponent {
 
   handleDragLeave(e) {
     // DragLeave gets fired for every child element, so make sure we're actually leaving the drop zone
-    if (!e.currentTarget || e.currentTarget.contains(e.relatedTarget)) {
+    if (!e.currentTarget || e.currentTarget instanceof Element && e.relatedTarget instanceof Element && e.currentTarget.contains(e.relatedTarget)) {
       return;
     }
 
@@ -635,8 +658,7 @@ export class Console extends PureComponent {
     commandHistoryStorage.addItem(language, scope, name, {
       command: name,
       startTime: new Date().toJSON(),
-      endTime: new Date().toJSON(),
-      result: null
+      endTime: new Date().toJSON()
     });
   }
 
@@ -664,7 +686,7 @@ export class Console extends PureComponent {
   }
 
   handleCsvError(error) {
-    this.addConsoleHistoryMessage(null, error);
+    this.addConsoleHistoryMessage(undefined, error ? "".concat(error) : undefined);
   }
 
   handleCsvInProgress(csvUploadInProgress) {
@@ -686,19 +708,19 @@ export class Console extends PureComponent {
       title: 'Print Stdout',
       action: this.handleTogglePrintStdout,
       group: ContextActions.groups.high,
-      icon: isPrintStdOutEnabled ? vsCheck : null,
+      icon: isPrintStdOutEnabled ? vsCheck : undefined,
       order: 10
     }, {
       title: 'Auto Launch Panels',
       action: this.handleToggleAutoLaunchPanels,
       group: ContextActions.groups.high,
-      icon: isAutoLaunchPanelsEnabled ? vsCheck : null,
+      icon: isAutoLaunchPanelsEnabled ? vsCheck : undefined,
       order: 20
     }, {
       title: 'Close Panels on Disconnect',
       action: this.handleToggleClosePanelsOnDisconnect,
       group: ContextActions.groups.high,
-      icon: isClosePanelsOnDisconnectEnabled ? vsCheck : null,
+      icon: isClosePanelsOnDisconnectEnabled ? vsCheck : undefined,
       order: 30
     }, {
       title: 'Upload Table from File',
@@ -763,9 +785,9 @@ export class Console extends PureComponent {
   }
 
   focus() {
-    var _this$consoleInput$cu;
+    var _this$consoleInput$cu2;
 
-    (_this$consoleInput$cu = this.consoleInput.current) === null || _this$consoleInput$cu === void 0 ? void 0 : _this$consoleInput$cu.focus();
+    (_this$consoleInput$cu2 = this.consoleInput.current) === null || _this$consoleInput$cu2 === void 0 ? void 0 : _this$consoleInput$cu2.focus();
   }
 
   sendSettingsChange(prevState, state) {
@@ -850,7 +872,7 @@ export class Console extends PureComponent {
       ref: this.consolePane
     }, /*#__PURE__*/React.createElement(ConsoleStatusBar, {
       session: session,
-      overflowActions: this.handleOverflowActions,
+      overflowActions: this.handleOverflowActions(),
       openObject: openObject,
       objects: consoleMenuObjects
     }, statusBarChildren), /*#__PURE__*/React.createElement("div", {
@@ -859,6 +881,7 @@ export class Console extends PureComponent {
       onDragEnter: this.handleDragEnter,
       onDragLeave: this.handleDragLeave
     }, showCsvOverlay && /*#__PURE__*/React.createElement(CsvOverlay, {
+      onCancel: this.handleCsvFileCanceled,
       onFileOpened: this.handleCsvFileOpened,
       onPaste: this.handleCsvPaste,
       clearDragError: this.handleClearDragError,
@@ -892,8 +915,8 @@ export class Console extends PureComponent {
       onClose: this.handleHideCsv,
       onUpdate: this.handleCsvUpdate,
       onError: this.handleCsvError,
-      file: csvFile,
-      paste: csvPaste,
+      file: csvFile !== null && csvFile !== void 0 ? csvFile : undefined,
+      paste: csvPaste !== null && csvPaste !== void 0 ? csvPaste : undefined,
       onInProgress: this.handleCsvInProgress,
       timeZone: timeZone,
       unzip: unzip
@@ -905,37 +928,10 @@ export class Console extends PureComponent {
 
 }
 
-_defineProperty(Console, "LOG_THROTTLE", 500);
-
-Console.propTypes = {
-  statusBarChildren: PropTypes.node,
-  settings: PropTypes.shape({}),
-  focusCommandHistory: PropTypes.func.isRequired,
-  openObject: PropTypes.func.isRequired,
-  closeObject: PropTypes.func.isRequired,
-  session: APIPropTypes.IdeSession.isRequired,
-  language: PropTypes.string.isRequired,
-  commandHistoryStorage: StoragePropTypes.CommandHistoryStorage.isRequired,
-  onSettingsChange: PropTypes.func,
-  scope: PropTypes.string,
-  actions: PropTypes.arrayOf(PropTypes.shape({})),
-  timeZone: PropTypes.string,
-  // Children shown at the bottom of the console history
-  historyChildren: PropTypes.node,
-  // Known object map
-  objectMap: PropTypes.instanceOf(Map),
-  disabled: PropTypes.bool,
-
-  /**
-   * Function to unzip a zip file. If not provided, zip files will not be accepted
-   * (file:File) => Promise<File[]>
-   */
-  unzip: PropTypes.func
-};
-Console.defaultProps = {
+_defineProperty(Console, "defaultProps", {
   statusBarChildren: null,
   settings: {},
-  onSettingsChange: () => {},
+  onSettingsChange: () => undefined,
   scope: null,
   actions: [],
   historyChildren: null,
@@ -943,6 +939,9 @@ Console.defaultProps = {
   objectMap: new Map(),
   disabled: false,
   unzip: null
-};
+});
+
+_defineProperty(Console, "LOG_THROTTLE", 500);
+
 export default Console;
 //# sourceMappingURL=Console.js.map