diff --git a/CHANGELOG.md b/CHANGELOG.md index 49cebc790ed403e357a2cf5a9711d0afcb4aea5a..4467ece33e62e9f29dac413c1828847ed9b766c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## new in jupyter-openbis-extension 0.4.0 + +- made it compatible to pybis-1.9.x +- minor bugfixes and improvements + ## new in jupyter-openbis-extension 0.3.0 - removed search-as-you-type feature, as it is not mature yet diff --git a/jupyter-openbis-extension/__init__.py b/jupyter-openbis-extension/__init__.py index 2e1b42c1462eb92b6d31866d4863c762320e1b89..c4c2f3ea1bd3b4b9375e676f33f3c6fd73ebcab2 100644 --- a/jupyter-openbis-extension/__init__.py +++ b/jupyter-openbis-extension/__init__.py @@ -1,7 +1,7 @@ name = 'jupyter-openbis-extension.server' __author__ = 'Swen Vermeul' __email__ = 'swen@ethz.ch' -__version__ = '0.3.0' +__version__ = '0.4.0' def _jupyter_server_extension_paths(): return [{ diff --git a/jupyter-openbis-extension/dataset.py b/jupyter-openbis-extension/dataset.py index f9ee9c78b2689e179916aea7dad6990c072f80f6..884c519c1a5159ab260f73208b55dae2dc3e0069 100644 --- a/jupyter-openbis-extension/dataset.py +++ b/jupyter-openbis-extension/dataset.py @@ -220,9 +220,9 @@ class DataSetUploadHandler(IPythonHandler): files = filenames, ) except Exception as e: - print(e) - errors.append({ - "create": 'Error while creating the dataset: {}'.format(e) + self.set_status(500) + self.write({ + "reason": 'Error while creating the dataset: {}'.format(e) }) # try to set the properties diff --git a/jupyter-openbis-extension/static/connectionDialog.js b/jupyter-openbis-extension/static/connectionDialog.js index ea1c86d4de8717ec2d8095881136d12c60f98f69..c8d01ab61e699f759c8569df0dea540df3242bf2 100644 --- a/jupyter-openbis-extension/static/connectionDialog.js +++ b/jupyter-openbis-extension/static/connectionDialog.js @@ -243,6 +243,7 @@ define( state.working_dir_element = working_dir_in let working_dir_reset = document.createElement("A") + working_dir_reset.className = "btn" working_dir_reset.innerText = "reset to default" working_dir_reset.onclick = function() { working_dir_in.value = default_working_dir @@ -311,4 +312,4 @@ define( } } } -) \ No newline at end of file +) diff --git a/jupyter-openbis-extension/static/uploadDialog.js b/jupyter-openbis-extension/static/uploadDialog.js index 5cbfae4ec21bf4d372c27e5e00e9ff273d05d9de..16e86669d0fbbee5cee2bafd112a66ea0b135591 100644 --- a/jupyter-openbis-extension/static/uploadDialog.js +++ b/jupyter-openbis-extension/static/uploadDialog.js @@ -234,6 +234,7 @@ define([ var filenameCell = row.insertCell() filenameCell.textContent = ".." filenameCell.style.width = "80%" + filenameCell.style.cursor = "pointer" filenameCell.onclick = function(){ var elems = data.path.split('/') elems.pop() @@ -267,6 +268,7 @@ define([ filenameCell.textContent = file.name filenameCell.style.width = "100%" + filenameCell.style.cursor = "pointer" if (file.type === "directory") { iconCell.className = "item_icon folder_icon icon-fixed-width" diff --git a/setup.py b/setup.py index 6aecfbb0054a3e1292fe49efc7ee2b20e6de8332..dc56ee882d12e85791ccce9874f138aa3b2ee854 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ with open("README.md", "r", encoding="utf-8") as fh: setup( name='jupyter-openbis-extension', - version= '0.3.0', + version= '0.4.0', author='Swen Vermeul | ID SIS | ETH Zürich', author_email='swen@ethz.ch', description='Extension for Jupyter notebooks to connect to openBIS and download/upload datasets, inluding the notebook itself', @@ -23,7 +23,7 @@ setup( install_requires=[ 'jupyter-nbextensions-configurator', 'jupyter', - 'pybis>=1.8.4', + 'pybis>=1.9.5', 'numpy', 'tornado==5.1.1', ],