From 042f6158a526a3504733f2a58f83c374744806fe Mon Sep 17 00:00:00 2001
From: vkovtun <viktor.kovtun@id.ethz.ch>
Date: Mon, 17 Jul 2023 10:22:50 +0200
Subject: [PATCH] SSDM-13579: Made datastore server calls work. Renamed
javascript classes to start from a capital letter.
---
.../src/js/server-data-store-client.js | 2 +-
.../src/js/server-data-store-facade.js | 78 +++++++++----------
.../database/data-browser/DataBrowser.jsx | 36 +++++++++
3 files changed, 76 insertions(+), 40 deletions(-)
diff --git a/api-data-store-server-javascript/src/js/server-data-store-client.js b/api-data-store-server-javascript/src/js/server-data-store-client.js
index 044fddbf5e4..99d0972b184 100644
--- a/api-data-store-server-javascript/src/js/server-data-store-client.js
+++ b/api-data-store-server-javascript/src/js/server-data-store-client.js
@@ -5,7 +5,7 @@ const HTTP_SERVER_URI = "/data-store-server";
/// The datastoreServer we use for our data
// datastoreServer = new datastore('https://localhost:8443/openbis', 'https://localhost:8444/datastore_server');
-datastoreServer = new dataStoreServer('http://localhost:8085', HTTP_SERVER_URI);
+datastoreServer = new DataStoreServer('http://localhost:8085', HTTP_SERVER_URI);
diff --git a/api-data-store-server-javascript/src/js/server-data-store-facade.js b/api-data-store-server-javascript/src/js/server-data-store-facade.js
index c2a1cb8e49f..e270ca214cd 100644
--- a/api-data-store-server-javascript/src/js/server-data-store-facade.js
+++ b/api-data-store-server-javascript/src/js/server-data-store-facade.js
@@ -4,22 +4,22 @@
* ======================================================
*/
-function _dataStoreServerInternal(datastoreUrlOrNull, httpServerUri){
+function _DataStoreServerInternal(datastoreUrlOrNull, httpServerUri){
this.init(datastoreUrlOrNull, httpServerUri);
}
-_dataStoreServerInternal.prototype.init = function(datastoreUrlOrNull, httpServerUri){
+_DataStoreServerInternal.prototype.init = function(datastoreUrlOrNull, httpServerUri){
this.datastoreUrl = this.normalizeUrl(datastoreUrlOrNull, httpServerUri);
this.httpServerUri = httpServerUri;
}
-_dataStoreServerInternal.prototype.log = function(msg){
+_DataStoreServerInternal.prototype.log = function(msg){
if(console){
console.log(msg);
}
}
-_dataStoreServerInternal.prototype.normalizeUrl = function(openbisUrlOrNull, httpServerUri){
+_DataStoreServerInternal.prototype.normalizeUrl = function(openbisUrlOrNull, httpServerUri){
var parts = this.parseUri(window.location);
if(openbisUrlOrNull){
@@ -37,15 +37,15 @@ _dataStoreServerInternal.prototype.normalizeUrl = function(openbisUrlOrNull, htt
return parts.protocol + "://" + parts.authority + httpServerUri;
}
-_dataStoreServerInternal.prototype.getUrlForMethod = function(method) {
+_DataStoreServerInternal.prototype.getUrlForMethod = function(method) {
return this.datastoreUrl + "?method=" + method;
}
-_dataStoreServerInternal.prototype.jsonRequestData = function(params) {
+_DataStoreServerInternal.prototype.jsonRequestData = function(params) {
return JSON.stringify(params);
}
-_dataStoreServerInternal.prototype.sendHttpRequest = function(httpMethod, contentType, url, data, callback) {
+_DataStoreServerInternal.prototype.sendHttpRequest = function(httpMethod, contentType, url, data, callback) {
const xhr = new XMLHttpRequest();
xhr.open(httpMethod, url);
xhr.setRequestHeader("content-type", contentType);
@@ -72,7 +72,7 @@ _dataStoreServerInternal.prototype.sendHttpRequest = function(httpMethod, conten
- _dataStoreServerInternal.prototype.buildGetUrl = function(queryParams) {
+ _DataStoreServerInternal.prototype.buildGetUrl = function(queryParams) {
const queryString = Object.keys(queryParams)
.map(key => `${encodeURIComponent(key)}=${encodeURIComponent(queryParams[key])}`)
.join('&');
@@ -83,7 +83,7 @@ _dataStoreServerInternal.prototype.sendHttpRequest = function(httpMethod, conten
// Functions for working with cookies (see http://www.quirksmode.org/js/cookies.html)
-_dataStoreServerInternal.prototype.createCookie = function(name,value,days) {
+_DataStoreServerInternal.prototype.createCookie = function(name,value,days) {
if (days) {
var date = new Date();
date.setTime(date.getTime()+(days*24*60*60*1000));
@@ -93,7 +93,7 @@ _dataStoreServerInternal.prototype.createCookie = function(name,value,days) {
document.cookie = name+"="+value+expires+"; path=/";
}
-_dataStoreServerInternal.prototype.readCookie = function(name) {
+_DataStoreServerInternal.prototype.readCookie = function(name) {
var nameEQ = name + "=";
var ca = document.cookie.split(';');
for(var i=0;i < ca.length;i++) {
@@ -104,13 +104,13 @@ _dataStoreServerInternal.prototype.readCookie = function(name) {
return null;
}
-_dataStoreServerInternal.prototype.eraseCookie = function(name) {
+_DataStoreServerInternal.prototype.eraseCookie = function(name) {
this.createCookie(name,"",-1);
}
// parseUri 1.2.2 (c) Steven Levithan <stevenlevithan.com> MIT License (see http://blog.stevenlevithan.com/archives/parseuri)
-_dataStoreServerInternal.prototype.parseUri = function(str) {
+_DataStoreServerInternal.prototype.parseUri = function(str) {
var options = {
strictMode: false,
key: ["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],
@@ -160,8 +160,8 @@ function parseJsonResponse(rawResponse, action) {
* The facade provides access to the DSS methods
*
*/
-function dataStoreServer(datastoreUrlOrNull, httpServerUri) {
- this._internal = new _dataStoreServerInternal(datastoreUrlOrNull, httpServerUri);
+function DataStoreServer(datastoreUrlOrNull, httpServerUri) {
+ this._internal = new _DataStoreServerInternal(datastoreUrlOrNull, httpServerUri);
}
@@ -176,7 +176,7 @@ function dataStoreServer(datastoreUrlOrNull, httpServerUri) {
*
* @method
*/
-dataStoreServer.prototype.rememberSession = function() {
+DataStoreServer.prototype.rememberSession = function() {
this._internal.createCookie('dataStoreServer', this.getSession(), 1);
}
@@ -185,7 +185,7 @@ dataStoreServer.prototype.rememberSession = function() {
*
* @method
*/
-dataStoreServer.prototype.forgetSession = function() {
+DataStoreServer.prototype.forgetSession = function() {
this._internal.eraseCookie('dataStoreServer');
}
@@ -194,7 +194,7 @@ dataStoreServer.prototype.forgetSession = function() {
*
* @method
*/
-dataStoreServer.prototype.restoreSession = function() {
+DataStoreServer.prototype.restoreSession = function() {
this._internal.sessionToken = this._internal.readCookie('dataStoreServer');
}
@@ -203,7 +203,7 @@ dataStoreServer.prototype.restoreSession = function() {
*
* @method
*/
-dataStoreServer.prototype.useSession = function(sessionToken){
+DataStoreServer.prototype.useSession = function(sessionToken){
this._internal.sessionToken = sessionToken;
}
@@ -212,7 +212,7 @@ dataStoreServer.prototype.useSession = function(sessionToken){
*
* @method
*/
-dataStoreServer.prototype.getSession = function(){
+DataStoreServer.prototype.getSession = function(){
return this._internal.sessionToken;
}
@@ -221,7 +221,7 @@ dataStoreServer.prototype.getSession = function(){
*
* @method
*/
-dataStoreServer.prototype.setInteractiveSessionKey = function(interactiveSessionKey){
+DataStoreServer.prototype.setInteractiveSessionKey = function(interactiveSessionKey){
this._internal.interactiveSessionKey = interactiveSessionKey;
}
@@ -230,7 +230,7 @@ dataStoreServer.prototype.setInteractiveSessionKey = function(interactiveSession
*
* @method
*/
-dataStoreServer.prototype.getInteractiveSessionKey = function(){
+DataStoreServer.prototype.getInteractiveSessionKey = function(){
return this._internal.interactiveSessionKey;
}
@@ -239,7 +239,7 @@ dataStoreServer.prototype.getInteractiveSessionKey = function(){
*
* @method
*/
-dataStoreServer.prototype.setTransactionManagerKey = function(transactionManagerKey){
+DataStoreServer.prototype.setTransactionManagerKey = function(transactionManagerKey){
this._internal.transactionManagerKey = transactionManagerKey;
}
@@ -248,11 +248,11 @@ dataStoreServer.prototype.setTransactionManagerKey = function(transactionManager
*
* @method
*/
-dataStoreServer.prototype.getTransactionManagerKey = function(){
+DataStoreServer.prototype.getTransactionManagerKey = function(){
return this._internal.transactionManagerKey;
}
-dataStoreServer.prototype.fillCommonParameters = function(params) {
+DataStoreServer.prototype.fillCommonParameters = function(params) {
if(this.getSession()) {
params["sessionToken"] = this.getSession();
}
@@ -272,7 +272,7 @@ const encodeParams = p => Object.entries(p).map(kv => kv.map(encodeURIComponent
*
* @method
*/
-dataStoreServer.prototype.login = function(userId, userPassword, action) {
+DataStoreServer.prototype.login = function(userId, userPassword, action) {
var datastoreObj = this
const data = this.fillCommonParameters({
"method": "login",
@@ -298,7 +298,7 @@ dataStoreServer.prototype.login = function(userId, userPassword, action) {
* Checks whether the current session is still active.
*
*/
-dataStoreServer.prototype.isSessionValid = function(action) {
+DataStoreServer.prototype.isSessionValid = function(action) {
if(this.getSession()){
const data = this.fillCommonParameters({"method":"isSessionValid"});
this._internal.sendHttpRequest(
@@ -321,7 +321,7 @@ dataStoreServer.prototype.isSessionValid = function(action) {
* @see isSessionActive()
* @method
*/
-dataStoreServer.prototype.ifRestoredSessionActive = function(action) {
+DataStoreServer.prototype.ifRestoredSessionActive = function(action) {
this.restoreSession();
this.isSessionValid(function(data) { if (data.result) action(data) });
}
@@ -331,7 +331,7 @@ dataStoreServer.prototype.ifRestoredSessionActive = function(action) {
*
* @method
*/
-dataStoreServer.prototype.logout = function(action) {
+DataStoreServer.prototype.logout = function(action) {
this.forgetSession();
if(this.getSession()){
@@ -358,7 +358,7 @@ dataStoreServer.prototype.logout = function(action) {
/**
* List files in the DSS for given owner and source
*/
-dataStoreServer.prototype.list = function(owner, source, recursively, action){
+DataStoreServer.prototype.list = function(owner, source, recursively, action){
const data = this.fillCommonParameters({
"method": "list",
"owner" : owner,
@@ -382,7 +382,7 @@ dataStoreServer.prototype.list = function(owner, source, recursively, action){
* @param {int} limit how many characters to read
* @param {*} action post-processing action
*/
-dataStoreServer.prototype.read = function(owner, source, offset, limit, action){
+DataStoreServer.prototype.read = function(owner, source, offset, limit, action){
const data = this.fillCommonParameters({
"method": "read",
"owner" : owner,
@@ -416,7 +416,7 @@ function hex2a(hexx) {
* @param {str} data data to write
* @param {*} action post-processing action
*/
-dataStoreServer.prototype.write = function(owner, source, offset, data, action){
+DataStoreServer.prototype.write = function(owner, source, offset, data, action){
const params = this.fillCommonParameters({
"method": "write",
"owner" : owner,
@@ -441,7 +441,7 @@ dataStoreServer.prototype.write = function(owner, source, offset, data, action){
* @param {str} source path to file
* @param {*} action post-processing action
*/
-dataStoreServer.prototype.delete = function(owner, source, action){
+DataStoreServer.prototype.delete = function(owner, source, action){
const data = this.fillCommonParameters({
"method": "delete",
"owner" : owner,
@@ -459,7 +459,7 @@ dataStoreServer.prototype.delete = function(owner, source, action){
/**
* Copy file within DSS
*/
-dataStoreServer.prototype.copy = function(sourceOwner, source, targetOwner, target, action){
+DataStoreServer.prototype.copy = function(sourceOwner, source, targetOwner, target, action){
const data = this.fillCommonParameters({
"method": "copy",
"sourceOwner" : sourceOwner,
@@ -479,7 +479,7 @@ dataStoreServer.prototype.copy = function(sourceOwner, source, targetOwner, targ
/**
* Move file within DSS
*/
-dataStoreServer.prototype.move = function(sourceOwner, source, targetOwner, target, action){
+DataStoreServer.prototype.move = function(sourceOwner, source, targetOwner, target, action){
const data = this.fillCommonParameters({
"method": "move",
"sourceOwner" : sourceOwner,
@@ -504,7 +504,7 @@ dataStoreServer.prototype.move = function(sourceOwner, source, targetOwner, targ
* ==================================================================================
*/
-dataStoreServer.prototype.begin = function(transactionId, action){
+DataStoreServer.prototype.begin = function(transactionId, action){
const data = this.fillCommonParameters({
"method": "begin",
"transactionId" : transactionId
@@ -519,7 +519,7 @@ dataStoreServer.prototype.begin = function(transactionId, action){
}
-dataStoreServer.prototype.prepare = function(action){
+DataStoreServer.prototype.prepare = function(action){
const data = this.fillCommonParameters({
"method": "prepare"
});
@@ -533,7 +533,7 @@ dataStoreServer.prototype.prepare = function(action){
}
-dataStoreServer.prototype.commit = function(action){
+DataStoreServer.prototype.commit = function(action){
const data = this.fillCommonParameters({
"method": "commit"
});
@@ -548,7 +548,7 @@ dataStoreServer.prototype.commit = function(action){
}
-dataStoreServer.prototype.rollback = function(action){
+DataStoreServer.prototype.rollback = function(action){
const data = this.fillCommonParameters({
"method": "rollback"
});
@@ -561,7 +561,7 @@ dataStoreServer.prototype.rollback = function(action){
);
}
-dataStoreServer.prototype.recover = function(action){
+DataStoreServer.prototype.recover = function(action){
const data = this.fillCommonParameters({
"method": "recover"
});
diff --git a/ui-admin/src/js/components/database/data-browser/DataBrowser.jsx b/ui-admin/src/js/components/database/data-browser/DataBrowser.jsx
index 5d03c641716..7190b2fb82e 100644
--- a/ui-admin/src/js/components/database/data-browser/DataBrowser.jsx
+++ b/ui-admin/src/js/components/database/data-browser/DataBrowser.jsx
@@ -14,6 +14,8 @@ import AppController from '@src/js/components/AppController.js'
import ItemIcon from '@src/js/components/database/data-browser/ItemIcon.jsx'
import InfoPanel from "@src/js/components/database/data-browser/InfoPanel.jsx";
+const HTTP_SERVER_URI = "/data-store-server";
+
const styles = theme => ({
boundary: {
padding: theme.spacing(1),
@@ -66,6 +68,13 @@ class DataBrowser extends React.Component {
constructor(props, context) {
super(props, context)
autoBind(this)
+ this.datastoreServer = new DataStoreServer('http://localhost:8085', HTTP_SERVER_URI);
+
+ const owner = "demo-sample"
+ const source = ""
+ this.datastoreServer.login("admin", "changeit", this.login);
+
+
this.state = {
viewType: props.viewType,
files: [
@@ -124,6 +133,33 @@ class DataBrowser extends React.Component {
}
}
+ login(token) {
+ if (!token) {
+ alert("Could not perform login.");
+ return;
+ }
+
+ console.log("Token: " + token)
+ this.datastoreServer.list("demo-sample", "", "true", this.displayReturnedFiles)
+ }
+
+ displayReturnedFiles(data) {
+ if (data.error) {
+ console.error(data.error);
+ alert("Could not list files.");
+ return;
+ }
+
+ const results = data.result[1];
+
+ // Restrict the display to 50 samples
+ // results = results.splice(0, 50);
+
+ // generateTable(results);
+
+ console.log("Received data: " + results)
+ }
+
handleViewTypeChange(viewType) {
this.setState({ viewType })
}
--
GitLab