From 94f36e21f8e8a161fb3a32dbf7838eb64929e9dc Mon Sep 17 00:00:00 2001
From: vermeul <swen@ethz.ch>
Date: Fri, 28 Jun 2019 01:06:34 +0200
Subject: [PATCH] try to fix problem with not correctly loaded libraries,
ongoing
---
.../static/entitySearcher.js | 44 ++++++++++++++-----
1 file changed, 34 insertions(+), 10 deletions(-)
diff --git a/jupyter-openbis-extension/static/entitySearcher.js b/jupyter-openbis-extension/static/entitySearcher.js
index 0cee181..4da8d27 100644
--- a/jupyter-openbis-extension/static/entitySearcher.js
+++ b/jupyter-openbis-extension/static/entitySearcher.js
@@ -64,25 +64,49 @@ define(["jquery", "./jquery-select2/js/select2.min"],
element.innerHTML = "<span style='color:orange;margin:5px'>loading...</span>"
if (!state.openbisService) {
require.config(this.getRequireJSV3Config(state.connection.dto.url))
- require(["openbis", "as/dto/experiment/search/ExperimentSearchCriteria",
- "as/dto/experiment/fetchoptions/ExperimentFetchOptions",
- "as/dto/sample/search/SampleSearchCriteria",
- "as/dto/sample/fetchoptions/SampleFetchOptions"], function(openbis) {
+ require(["openbis", "as/dto/experiment/search/ExperimentSearchCriteria",
+ "as/dto/experiment/fetchoptions/ExperimentFetchOptions",
+ "as/dto/sample/search/SampleSearchCriteria",
+ "as/dto/sample/fetchoptions/SampleFetchOptions"],
+
+ function (openbis) {
var apiUrl = state.connection.dto.url + "/openbis/openbis/rmi-application-server-v3.json"
var v3 = new openbis(apiUrl)
v3.login(state.connection.dto.username, state.connection.dto.password)
- .done(function(sessionToken) {
+ .done(function (sessionToken) {
+ console.log("sessionToken heisst:");
+ console.log(sessionToken);
state.openbisService = v3
var userName = window.location.pathname.split("/")[2];
- _this.loadResource('/user/' + userName+ '/nbextensions/openbis/jquery-select2/css/select2.min.css', 'css', function() {
+ _this.loadResource('/user/' + userName + '/nbextensions/openbis/jquery-select2/css/select2.min.css', 'css', function () {
_this.createDropdown(element, state, upload)
})
- }).fail(function(result) {
- alert('openbis v3 service login failed for ' + apiUrl
- + " : property 'trusted-cross-origin-domains' is probably not set in service.properties.")
})
+ .fail(function (result) {
+ alert('openbis v3 service login failed for ' + apiUrl
+ + " : property 'trusted-cross-origin-domains' is probably not set in service.properties.")
+ console.log(element);
+ let entityIdentifier = document.createElement("INPUT")
+ entityIdentifier.type = "text"
+ entityIdentifier.name = "entityIdentifier"
+ entityIdentifier.size = 40
+ entityIdentifier.placeholder = "Sample or Experiment identifier/permId"
+ entityIdentifier.value = state.entityIdentifier
+ element.parentNode.removeChild(element.nextElementSibling)
+ element.parentNode.insertBefore(entityIdentifier, element.nextSibling)
+ })
+ },
+ function (err){
+ let entityIdentifier = document.createElement("INPUT")
+ entityIdentifier.type = "text"
+ entityIdentifier.name = "entityIdentifier"
+ entityIdentifier.size = 40
+ entityIdentifier.placeholder = "Sample or Experiment identifier/permId"
+ console.log(element);
+ element.innerHTML = entityIdentifier
})
- } else {
+ }
+ else {
_this.createDropdown(element, state, upload)
}
--
GitLab