@deephaven/dashboard-core-plugins 0.15.5-beta.3 → 0.15.5-beta.4

package/dist/panels/NotebookPanel.js

@@ -7,20 +7,18 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 // Wrapper for the Notebook for use in a golden layout container
 import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
-import PropTypes from 'prop-types';
 import memoize from 'memoize-one';
 import { connect } from 'react-redux';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { BasicModal, ContextActions, DropdownMenu, Tooltip, GLOBAL_SHORTCUTS } from '@deephaven/components';
 import { ScriptEditor, ScriptEditorUtils, SHORTCUTS } from '@deephaven/console';
-import { GLPropTypes } from '@deephaven/dashboard';
 import { FileUtils, NewItemModal } from '@deephaven/file-explorer';
 import { vsSave, vsKebabVertical, dhFileSearch, vsPlay, dhRunSelection } from '@deephaven/icons';
 import { getFileStorage } from '@deephaven/redux';
 import classNames from 'classnames';
 import debounce from 'lodash.debounce';
 import Log from '@deephaven/log';
-import { Pending, PromiseUtils } from '@deephaven/utils';
+import { assertNotNull, Pending, PromiseUtils } from '@deephaven/utils';
 import { ConsoleEvent, NotebookEvent } from "../events/index.js";
 import { getDashboardSessionWrapper } from "../redux/index.js";
 import Panel from "./Panel.js";
@@ -58,8 +56,24 @@ class NotebookPanel extends Component {
   }
 
   constructor(props) {
+    var _fileMetadata;
+
     super(props);
 
+    _defineProperty(this, "pending", void 0);
+
+    _defineProperty(this, "debouncedSavePanelState", void 0);
+
+    _defineProperty(this, "debouncedLoad", void 0);
+
+    _defineProperty(this, "notebook", void 0);
+
+    _defineProperty(this, "tabTitleElement", void 0);
+
+    _defineProperty(this, "tabInitOnce", void 0);
+
+    _defineProperty(this, "shouldPromptClose", void 0);
+
     _defineProperty(this, "getOverflowActions", memoize(() => [{
       title: 'Find',
       icon: dhFileSearch,
@@ -104,7 +118,6 @@ class NotebookPanel extends Component {
     this.debouncedLoad = debounce(this.load.bind(this), DEBOUNCE_PANEL_STATE_UPDATE);
     this.notebook = null;
     this.tabTitleElement = null;
-    this.unsavedIndicator = null;
     this.tabInitOnce = false;
     this.shouldPromptClose = true;
     var {
@@ -114,7 +127,8 @@ class NotebookPanel extends Component {
       panelState
     } = props;
     var settings = {
-      value: ''
+      value: '',
+      language: ''
     };
     var fileMetadata = null;
     var {
@@ -131,13 +145,13 @@ class NotebookPanel extends Component {
     // may need to implement some other indication that this notebook has never been saved
 
 
-    var hasFileId = fileMetadata.itemName && FileUtils.hasPath(fileMetadata.itemName); // Unsaved if file id != null and content != null
+    var hasFileId = ((_fileMetadata = fileMetadata) === null || _fileMetadata === void 0 ? void 0 : _fileMetadata.itemName) && FileUtils.hasPath(fileMetadata.itemName); // Unsaved if file id != null and content != null
     // OR file id is null AND content is not null or ''
 
     var isUnsaved = hasFileId && settings.value != null || !hasFileId && settings.value;
     var changeCount = isUnsaved ? 1 : 0;
     this.state = {
-      error: null,
+      error: undefined,
       isDashboardActive,
       isFocused: false,
       isLoading: true,
@@ -181,7 +195,7 @@ class NotebookPanel extends Component {
     } = this.state;
 
     if (isPreview !== prevState.isPreview) {
-      this.setPreviewStatus(isPreview);
+      this.setPreviewStatus();
     }
   }
 
@@ -199,10 +213,10 @@ class NotebookPanel extends Component {
     glEventHub.off(NotebookEvent.RENAME_FILE, this.handleRenameFile);
     glContainer.off('tabClicked', this.handlePanelTabClick);
     glEventHub.emit(NotebookEvent.UNREGISTER_FILE, fileMetadata, isPreview);
-  } // Called by TabEvent. Happens once when created, but also each time its moved.
-  // when moved, need to re-init the unsaved indicators on title elements
-
+  }
 
+  // Called by TabEvent. Happens once when created, but also each time its moved.
+  // when moved, need to re-init the unsaved indicators on title elements
   initTab(tab) {
     if (!this.tabInitOnce) {
       this.tabInitOnce = true;
@@ -232,14 +246,17 @@ class NotebookPanel extends Component {
       } else {
         close();
       }
+
+      return true;
     };
   }
 
   initTabClasses(tab) {
     var tabElement = tab.element.get(0);
+    assertNotNull(tabElement);
     var titleElement = tabElement.querySelector('.lm_title');
     this.tabTitleElement = titleElement;
-    titleElement.classList.add('notebook-title');
+    titleElement === null || titleElement === void 0 ? void 0 : titleElement.classList.add('notebook-title');
     this.setPreviewStatus();
   }
 
@@ -321,6 +338,7 @@ class NotebookPanel extends Component {
       fileMetadata,
       settings
     } = this.state;
+    assertNotNull(fileMetadata);
     var {
       id
     } = fileMetadata;
@@ -328,6 +346,8 @@ class NotebookPanel extends Component {
       fileStorage
     } = this.props;
     this.pending.add(fileStorage.loadFile(id)).then(loadedFile => {
+      var _NotebookPanel$langua;
+
       log.debug('Loaded file', loadedFile);
       var {
         filename: itemName
@@ -347,7 +367,7 @@ class NotebookPanel extends Component {
       }
 
       var updatedSettings = _objectSpread(_objectSpread({}, settings), {}, {
-        language: NotebookPanel.languageFromFileName(itemName)
+        language: (_NotebookPanel$langua = NotebookPanel.languageFromFileName(itemName)) !== null && _NotebookPanel$langua !== void 0 ? _NotebookPanel$langua : ''
       });
 
       if (settings.value == null) {
@@ -366,7 +386,7 @@ class NotebookPanel extends Component {
   }
   /**
    * Attempts to save the notebook.
-   * @returns {boolean} Returns true if save has begun, false if user needed to be prompted
+   * @returns Returns true if save has begun, false if user needed to be prompted
    */
 
 
@@ -377,8 +397,13 @@ class NotebookPanel extends Component {
 
     if (fileMetadata && FileUtils.hasPath(fileMetadata.itemName)) {
       var content = this.getNotebookValue();
-      this.saveContent(fileMetadata.itemName, content);
-      return true;
+
+      if (content != null) {
+        this.saveContent(fileMetadata.itemName, content);
+        return true;
+      }
+
+      return false;
     }
 
     this.setState({
@@ -388,8 +413,8 @@ class NotebookPanel extends Component {
   }
   /**
    * Update existing file content
-   * @param {string} filename The name of the file
-   * @param {string} content New file content
+   * @param filename The name of the file
+   * @param content New file content
    */
 
 
@@ -401,7 +426,8 @@ class NotebookPanel extends Component {
     } = this.props;
     this.pending.add(fileStorage.saveFile({
       filename,
-      content
+      content,
+      basename: filename
     })).then(this.handleSaveSuccess).catch(this.handleSaveError);
   }
 
@@ -506,6 +532,7 @@ class NotebookPanel extends Component {
       fileMetadata,
       settings
     } = this.state;
+    assertNotNull(fileMetadata);
     var content = this.getNotebookValue();
     var {
       language
@@ -515,17 +542,17 @@ class NotebookPanel extends Component {
     } = fileMetadata;
     var copyName = FileUtils.getCopyFileName(itemName);
     log.debug('handleCopy', fileMetadata, itemName, copyName);
-    this.createNotebook(copyName, language, content);
+    this.createNotebook(copyName, language, content !== null && content !== void 0 ? content : undefined);
   }
 
   handleEditorChange(e) {
     log.debug2('handleEditorChanged', e);
     this.removePreviewStatus();
-    this.setState(_ref2 => {
+    this.setState(state => {
       var {
         changeCount,
         savedChangeCount
-      } = _ref2;
+      } = state;
       var {
         isUndoing,
         isRedoing
@@ -534,7 +561,8 @@ class NotebookPanel extends Component {
       if (isUndoing) {
         // Note that it's possible to undo past where the user last saved, if they save and then undo for example
         return {
-          changeCount: changeCount - 1
+          changeCount: changeCount - 1,
+          savedChangeCount
         };
       }
 
@@ -549,7 +577,8 @@ class NotebookPanel extends Component {
       }
 
       return {
-        changeCount: changeCount + 1
+        changeCount: changeCount + 1,
+        savedChangeCount
       };
     });
     this.debouncedSavePanelState();
@@ -575,7 +604,7 @@ class NotebookPanel extends Component {
     });
   }
   /**
-   * @param {MouseEvent} event The click event from clicking on the link
+   * @param event The click event from clicking on the link
    */
 
 
@@ -587,7 +616,7 @@ class NotebookPanel extends Component {
     } = this.props;
     var {
       href
-    } = event.target;
+    } = event.currentTarget;
 
     if (!href || !href.startsWith(notebooksUrl)) {
       return;
@@ -619,7 +648,7 @@ class NotebookPanel extends Component {
 
   handleLoadSuccess() {
     this.setState({
-      error: null,
+      error: undefined,
       isLoaded: true,
       isLoading: false
     });
@@ -649,6 +678,8 @@ class NotebookPanel extends Component {
   }
 
   handleSaveSuccess(file) {
+    var _NotebookPanel$langua2;
+
     var {
       fileStorage
     } = this.props;
@@ -656,7 +687,7 @@ class NotebookPanel extends Component {
       id: file.filename,
       itemName: file.filename
     };
-    var language = NotebookPanel.languageFromFileName(file.filename);
+    var language = (_NotebookPanel$langua2 = NotebookPanel.languageFromFileName(file.filename)) !== null && _NotebookPanel$langua2 !== void 0 ? _NotebookPanel$langua2 : '';
     this.setState(state => {
       var {
         fileMetadata: oldMetadata
@@ -668,7 +699,7 @@ class NotebookPanel extends Component {
 
       log.debug('handleSaveSuccess', fileMetadata, oldMetadata, settings);
 
-      if (FileUtils.hasPath(oldMetadata.itemName) && oldMetadata.itemName !== fileMetadata.itemName) {
+      if (oldMetadata && FileUtils.hasPath(oldMetadata.itemName) && oldMetadata.itemName !== fileMetadata.itemName) {
         log.debug('handleSaveSuccess deleting old file', oldMetadata.itemName);
         fileStorage.deleteFile(oldMetadata.itemName).catch(NotebookPanel.handleError);
       }
@@ -704,14 +735,21 @@ class NotebookPanel extends Component {
   }
 
   handleSaveAsSubmit(name) {
+    var _this$getNotebookValu;
+
     log.debug('handleSaveAsSubmit', name);
     var {
       fileMetadata
     } = this.state;
+
+    if (!fileMetadata) {
+      return;
+    }
+
     var {
       itemName: prevItemName
     } = fileMetadata;
-    var content = this.getNotebookValue();
+    var content = (_this$getNotebookValu = this.getNotebookValue()) !== null && _this$getNotebookValu !== void 0 ? _this$getNotebookValu : '';
     this.setState({
       showSaveAsModal: false
     });
@@ -734,7 +772,7 @@ class NotebookPanel extends Component {
       fileMetadata
     } = this.state;
 
-    if (fileMetadata.id === oldName) {
+    if (fileMetadata && fileMetadata.id === oldName) {
       this.setState({
         fileMetadata: {
           id: newName,
@@ -756,12 +794,14 @@ class NotebookPanel extends Component {
   }
 
   handleRunAll() {
+    var _this$notebook$getVal;
+
     if (!this.notebook) {
       log.error('Editor is not initialized.');
       return;
     }
 
-    this.runCommand(this.notebook.getValue());
+    this.runCommand((_this$notebook$getVal = this.notebook.getValue()) !== null && _this$notebook$getVal !== void 0 ? _this$notebook$getVal : undefined);
   }
 
   handleRunSelected() {
@@ -773,10 +813,10 @@ class NotebookPanel extends Component {
     this.runCommand(this.notebook.getSelectedCommand());
   }
 
-  handleSessionOpened(session, _ref3) {
+  handleSessionOpened(session, _ref2) {
     var {
       language
-    } = _ref3;
+    } = _ref2;
     this.setState({
       session,
       sessionLanguage: language
@@ -785,8 +825,8 @@ class NotebookPanel extends Component {
 
   handleSessionClosed() {
     this.setState({
-      session: null,
-      sessionLanguage: null
+      session: undefined,
+      sessionLanguage: undefined
     });
   }
 
@@ -839,7 +879,7 @@ class NotebookPanel extends Component {
   }
   /**
    * Transform the link URI to load from where the notebook is if it's relative
-   * @param {String} src The link to transform
+   * @param src The link to transform
    * @returns String the transformed link
    */
 
@@ -882,7 +922,8 @@ class NotebookPanel extends Component {
     });
   }
 
-  createNotebook(itemName, language, content) {
+  createNotebook(itemName, language) {
+    var content = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
     var {
       glEventHub
     } = this.props;
@@ -919,16 +960,20 @@ class NotebookPanel extends Component {
   }
 
   removePreviewStatus() {
-    this.setState(_ref4 => {
+    this.setState(_ref3 => {
       var {
         isPreview
-      } = _ref4;
+      } = _ref3;
 
       if (isPreview) {
         var {
           fileMetadata
         } = this.state;
-        this.registerFileMetadata(fileMetadata, false);
+
+        if (fileMetadata) {
+          this.registerFileMetadata(fileMetadata, false);
+        }
+
         return {
           isPreview: false
         };
@@ -939,7 +984,7 @@ class NotebookPanel extends Component {
   }
 
   render() {
-    var _fileMetadata$itemNam;
+    var _fileMetadata$itemNam, _settings$value;
 
     var {
       fileStorage,
@@ -994,11 +1039,13 @@ class NotebookPanel extends Component {
       group: ContextActions.groups.high,
       order: 20
     }];
+    var portal = tab.element.find('.lm_title_before').get(0);
+    assertNotNull(portal);
     return /*#__PURE__*/React.createElement(React.Fragment, null, tab && /*#__PURE__*/ReactDOM.createPortal( /*#__PURE__*/React.createElement("span", {
       className: classNames('editor-unsaved-indicator', {
         'is-unsaved': changeCount !== savedChangeCount
       })
-    }), tab.element.find('.lm_title_before').get(0) // tab.element is jquery element, we want a dom element
+    }), portal // tab.element is jquery element, we want a dom element
     ), /*#__PURE__*/React.createElement(Panel, {
       className: "notebook-container",
       componentPanel: this,
@@ -1063,7 +1110,7 @@ class NotebookPanel extends Component {
         this.notebook = notebook;
       }
     })), isMarkdown && /*#__PURE__*/React.createElement(MarkdownNotebook, {
-      content: settings.value,
+      content: (_settings$value = settings.value) !== null && _settings$value !== void 0 ? _settings$value : '',
       onLinkClick: this.handleLinkClick,
       onRunCode: this.handleRunCommand,
       transformImageUri: this.handleTransformLinkUri,
@@ -1101,33 +1148,13 @@ _defineProperty(NotebookPanel, "POPPER_OPTIONS", {
 
 _defineProperty(NotebookPanel, "DEFAULT_NAME", 'Untitled');
 
-NotebookPanel.propTypes = {
-  fileStorage: PropTypes.shape({
-    deleteFile: PropTypes.func.isRequired,
-    loadFile: PropTypes.func.isRequired,
-    saveFile: PropTypes.func.isRequired
-  }).isRequired,
-  glContainer: GLPropTypes.Container.isRequired,
-  glEventHub: GLPropTypes.EventHub.isRequired,
-  isDashboardActive: PropTypes.bool,
-  isPreview: PropTypes.bool,
-  metadata: PropTypes.shape({
-    id: PropTypes.string.isRequired
-  }).isRequired,
-  session: PropTypes.shape({}),
-  sessionLanguage: PropTypes.string,
-  panelState: PropTypes.shape({
-    settings: PropTypes.shape({}),
-    fileMetadata: PropTypes.shape({})
-  }).isRequired,
-  notebooksUrl: PropTypes.string.isRequired
-};
-NotebookPanel.defaultProps = {
+_defineProperty(NotebookPanel, "defaultProps", {
   isDashboardActive: true,
   isPreview: false,
   session: null,
-  sessionLanguage: null
-};
+  sessionLanguage: null,
+  notebooksUrl: new URL("".concat(process.env.REACT_APP_NOTEBOOKS_URL, "/"), "".concat(window.location)).href
+});
 
 var mapStateToProps = (state, ownProps) => {
   var fileStorage = getFileStorage(state);