diff --git a/jupyter-openbis-extension/static/dialog.js b/jupyter-openbis-extension/static/dialog.js index 7baf6980de33a47e6552bb4d46d94f23a0791424..7429cd811b2b704aaeaec324b49132587fa30dd7 100644 --- a/jupyter-openbis-extension/static/dialog.js +++ b/jupyter-openbis-extension/static/dialog.js @@ -101,10 +101,10 @@ define([ status_badge.className = "label label-danger" message = document.createElement("p") if (response.status === 401) { - message.textContent = "Wrong username/password" + message.textContent = "username/password incorrect" } else if (response.status === 500) { - message.textContent = "Cannot connect server" + message.textContent = "Connection error" } else { message.textContent = "General error" @@ -303,18 +303,8 @@ define([ response.json() .then( function(data) { //console.log(data.dataSetTypes) - dts = data.dataSetTypes - while (dataset_types.firstChild) { - dataset_types.removeChild(dataset_types.firstChild); - } - for (dt of dts) { - var option = document.createElement("OPTION") - option.value = dt.code - option.textContent = dt.description ? dt.code + ": " + dt.description : dt.code - dataset_types.appendChild(option) - } - dataset_types.onchange = function() { + var change_input_fields = function() { // remove existing input fields while (input_fields.firstChild) { input_fields.removeChild(input_fields.firstChild) @@ -334,6 +324,22 @@ define([ input_fields.appendChild(document.createElement("BR")) } } + dataset_types.onchange = change_input_fields + + // remove the old and add the new dataset-types + dts = data.dataSetTypes + while (dataset_types.firstChild) { + dataset_types.removeChild(dataset_types.firstChild); + } + for (dt of dts) { + var option = document.createElement("OPTION") + option.value = dt.code + option.textContent = dt.description ? dt.code + ": " + dt.description : dt.code + dataset_types.appendChild(option) + } + // change the input fields, since we just received new datasetTypes + change_input_fields() + }) .catch( function(error){ console.error("Error while parsing dataset types", error) @@ -747,10 +753,15 @@ define([ } function _onLoad () { - // register new action + // show connections + var download_datasets = IPython.keyboard_manager.actions.register( + OpenBisConnections, 'openbis-connections', 'jupyter-openBIS') + + // dnownload var download_datasets = IPython.keyboard_manager.actions.register( fetchDatasetFromOpenBis, 'openbis-dataset-download', 'jupyter-openBIS') + // upload var upload_datasets = IPython.keyboard_manager.actions.register( uploadDatasetsToOpenBis, 'openbis-dataset-upload', 'jupyter-openBIS')