Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jupyter-openbis-gui-widget
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
openbis
openbis-public
jupyter
jupyter-openbis-gui-widget
Commits
94f36e21
Commit
94f36e21
authored
5 years ago
by
Swen Vermeul
Browse files
Options
Downloads
Patches
Plain Diff
try to fix problem with not correctly loaded libraries, ongoing
parent
9a7c592d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
jupyter-openbis-extension/static/entitySearcher.js
+34
-10
34 additions, 10 deletions
jupyter-openbis-extension/static/entitySearcher.js
with
34 additions
and
10 deletions
jupyter-openbis-extension/static/entitySearcher.js
+
34
−
10
View file @
94f36e21
...
@@ -64,25 +64,49 @@ define(["jquery", "./jquery-select2/js/select2.min"],
...
@@ -64,25 +64,49 @@ define(["jquery", "./jquery-select2/js/select2.min"],
element
.
innerHTML
=
"
<span style='color:orange;margin:5px'>loading...</span>
"
element
.
innerHTML
=
"
<span style='color:orange;margin:5px'>loading...</span>
"
if
(
!
state
.
openbisService
)
{
if
(
!
state
.
openbisService
)
{
require
.
config
(
this
.
getRequireJSV3Config
(
state
.
connection
.
dto
.
url
))
require
.
config
(
this
.
getRequireJSV3Config
(
state
.
connection
.
dto
.
url
))
require
([
"
openbis
"
,
"
as/dto/experiment/search/ExperimentSearchCriteria
"
,
require
([
"
openbis
"
,
"
as/dto/experiment/search/ExperimentSearchCriteria
"
,
"
as/dto/experiment/fetchoptions/ExperimentFetchOptions
"
,
"
as/dto/experiment/fetchoptions/ExperimentFetchOptions
"
,
"
as/dto/sample/search/SampleSearchCriteria
"
,
"
as/dto/sample/search/SampleSearchCriteria
"
,
"
as/dto/sample/fetchoptions/SampleFetchOptions
"
],
function
(
openbis
)
{
"
as/dto/sample/fetchoptions/SampleFetchOptions
"
],
function
(
openbis
)
{
var
apiUrl
=
state
.
connection
.
dto
.
url
+
"
/openbis/openbis/rmi-application-server-v3.json
"
var
apiUrl
=
state
.
connection
.
dto
.
url
+
"
/openbis/openbis/rmi-application-server-v3.json
"
var
v3
=
new
openbis
(
apiUrl
)
var
v3
=
new
openbis
(
apiUrl
)
v3
.
login
(
state
.
connection
.
dto
.
username
,
state
.
connection
.
dto
.
password
)
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
state
.
openbisService
=
v3
var
userName
=
window
.
location
.
pathname
.
split
(
"
/
"
)[
2
];
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
)
_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
)
_this
.
createDropdown
(
element
,
state
,
upload
)
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment