gCubeSystem
/
cdn-experiments
15
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Beta of the refactoring for modular use with toolbar and details with auto-linking and event driven communication. Drag and drop support is still to be implemented (if needed)

This commit is contained in:
Mauro Mugnaini 2023-08-08 20:16:26 +02:00
parent 286312aee5
commit 33eedd6d48
1 changed files with 521 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

729
storage/d4s-storage.js
View File

@ -5,168 +5,306 @@ var D4S_STORAGE_SCRIPT = document.currentScript
*/ */
class D4SStorageHtmlElement extends HTMLElement { class D4SStorageHtmlElement extends HTMLElement {
#d4smissmsg = 'Required d4s-boot-2 component not found' #srcbaseurl = null
#baseurl = 'https://api.d4science.org/workspace'
//#baseurl = 'https://workspace-repository.dev.d4science.org/storagehub/workspace'
#boot = null
#d4sworkspace = null;
#showroot = false; // To show WS root folder by default set it to true
constructor() { constructor() {
super() super()
this.#boot = document.querySelector('d4s-boot-2') if (D4S_STORAGE_SCRIPT && D4S_STORAGE_SCRIPT.src) {
this.#d4sworkspace = new D4SWorkspace(this.#baseurl, this.#boot) this.#srcbaseurl = D4S_STORAGE_SCRIPT.src.substring(0, D4S_STORAGE_SCRIPT.src.lastIndexOf('/'));
}
this.attachShadow({mode: 'open'})
}
static appendBootstrapStylesheets(root) {
let linkElem = document.createElement('link');
linkElem.setAttribute('rel', 'stylesheet');
linkElem.setAttribute('href', 'https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css');
root.appendChild(linkElem);
}
get srcBaseURL() {
return this.#srcbaseurl;
}
}
class D4SStorageToolbar extends HTMLElement {
static toolbar_event_name = "d4s-toolbar";
static refresh_folder = "refresh-folder";
static create_folder = "create-folder";
static delete_folder = "delete-folder";
static download = "download";
static upload_file = "upload-file";
static upload_archive = "upload-archive";
#last_action = null;
constructor() {
super()
this.attachShadow({mode: 'open'})
}
connectedCallback() {
D4SStorageHtmlElement.appendBootstrapStylesheets(this.shadowRoot);
var div = document.createElement('div');
div.innerHTML = /*html*/`
<div class="border">
<span class="px-2" id="refresh"><img src="img/arrow-clockwise.svg" alt="Refresh folder contents"></img></span>
<span class="px-2" id="create"><img src="img/folder-plus.svg" alt="Create new folder"></img></span>
<span class="px-2" id="delete"><img src="img/folder-x.svg" alt="Delete folder"></img></span>
<span class="px-2" id="download"><img src="img/box-arrow-down.svg" alt="Download folder as ZIP"></img></span>
<span class="px-2" id="upload-file"><img src="img/box-arrow-in-up.svg" alt="Upload file"></img></span>
<span class="px-2" id="upload-archive"><img src="img/file-earmark-zip.svg" alt="Upload archive"></img></span>
</div>`;
div.querySelector("#refresh").addEventListener('click', (ev) => {
ev.stopPropagation();
this.actionPerformed(D4SStorageToolbar.refresh_folder);
});
div.querySelector("#create").addEventListener('click', (ev) => {
ev.stopPropagation();
this.actionPerformed(D4SStorageToolbar.create_folder);
});
div.querySelector("#delete").addEventListener('click', (ev) => {
ev.stopPropagation();
this.actionPerformed(D4SStorageToolbar.delete_folder);
});
div.querySelector("#download").addEventListener('click', (ev) => {
ev.stopPropagation();
this.actionPerformed(D4SStorageToolbar.download);
});
div.querySelector("#upload-file").addEventListener('click', (ev) => {
ev.stopPropagation();
this.actionPerformed(D4SStorageToolbar.upload_file);
});
div.querySelector("#upload-archive").addEventListener('click', (ev) => {
ev.stopPropagation();
this.actionPerformed(D4SStorageToolbar.upload_archive);
});
this.shadowRoot.appendChild(div);
}
actionPerformed(action) {
this.#last_action = action;
this.dispatchEvent(new CustomEvent(D4SStorageToolbar.toolbar_event_name, {detail: action}));
}
get lastAction() {
return this.#last_action;
}
}
class D4SStorageTree extends D4SStorageHtmlElement {
static tree_event_name = "d4s-toolbar";
static folder_data_event_name = "d4s-folder-data";
static dataid_attr = 'data-id';
static dataname_attr = 'data-name';
static parentid_attr = 'parent-id';
#loadedClass = 'loaded'
#selectedClass = 'selected'
#selectedbgcolor = 'lightgray'
#boot = null
#baseurl = 'https://api.d4science.org/workspace'
#d4sworkspace = null;
#foldersMap = {};
#currentid = null;
constructor() {
super()
this.#boot = document.querySelector('d4s-boot-2');
this.#d4sworkspace = new D4SWorkspace(this.#baseurl, this.#boot);
} }
get boot() { get boot() {
if (this.#boot == null) { return this.#boot;
this.#boot = document.querySelector('d4s-boot-2')
if (!this.#boot) {
throw this.#d4smissmsg
} }
}
return this.#boot
}
appendStylesheets(root) {
const linkElem1 = document.createElement('link')
linkElem1.setAttribute('rel', 'stylesheet')
linkElem1.setAttribute('href', 'https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css')
root.appendChild(linkElem1)
}
buildListUrl(id) {
return this.#baseurl + '/items/' + id + '/children'
}
get baseUrl() { get baseUrl() {
return this.#baseurl return this.#baseurl;
} }
set baseUrl(url) { set baseUrl(url) {
this.#baseurl = url this.#baseurl = url;
this.setAttribute("baseurl", url) // this.setAttribute("baseurl", url)
this.#d4sworkspace = new D4SWorkspace(this.#baseurl, this.#boot) this.#d4sworkspace = new D4SWorkspace(this.#baseurl, this.#boot);
} }
get d4sWorkspace() { get d4sWorkspace() {
return this.#d4sworkspace; return this.#d4sworkspace;
} }
get showRoot() { set currentId(id) {
return this.#showroot; this.#currentid = id;
} }
set showRoot(show) { get currentId() {
this.#showroot = show; return this.#currentid;
} }
setFolderItems(id, items) {
this.#foldersMap[id] = items;
this.dispatchEvent(
new CustomEvent(
D4SStorageTree.folder_data_event_name,
{detail: id}
)
);
} }
getFolderItems(id) {
/** return this.#foldersMap[id];
* Builds storagehub VREFolder tree }
* <d4s-storage-tree
* /@filelist-id: identifier of d4s-storage-folder component getSelectedFolderItems() {
* /@base-url: the base endpoint url [defaults to: https://api.d4science.org/workspace] this.getFolderItems(this.currentId);
* /@show-root: false (or omitted) to show the VRE folder (default), true to show the root folder of the WS
*/
window.customElements.define('d4s-storage-tree', class extends D4SStorageHtmlElement {
#storageFilelistId = null
#loadedClass = 'loaded'
#selectedClass = 'selected'
#selectedbgcolor = 'lightgray'
#shadowRoot
constructor() {
super()
this.#shadowRoot = this.attachShadow({mode: 'open'})
} }
/*
Notes:
API docs: https://gcube.wiki.gcube-system.org/gcube/StorageHub_REST_API
Preprod: https://accounts.pre.d4science.org
Sample context: %2Fpred4s%2Fpreprod%2FpreVRE
User workspace: https://storagehub.pre.d4science.net/storagehub/workspace
vrefolder: https://storagehub.pre.d4science.net/storagehub/workspace/vrefolder
-> and if "id": "e0cd15d2-0071-43ca-bc42-aef8d80660fe",
the tree dir of vrefolder: https://storagehub.pre.d4science.net/storagehub/workspace/items/e0cd15d2-0071-43ca-bc42-aef8d80660fe/children
download of a file (domenica.jpg): https://storagehub.pre.d4science.net/storagehub/workspace/items/a5086811-59d1-4230-99fa-98431e820cf1/download
*/
connectedCallback() { connectedCallback() {
this.appendStylesheets(this.#shadowRoot) D4SStorageHtmlElement.appendBootstrapStylesheets(this.shadowRoot)
var div = document.createElement('div') var div = document.createElement('div')
const style = ` div.innerHTML = /*css*/`
<style> <style>
.selected > *:first-child { .selected > *:first-child {
background-color: ${this.#selectedbgcolor}; background-color: ${this.#selectedbgcolor};
} }
ul.root {
padding-left: 0;
}
ul, li { ul, li {
list-style-type: none; list-style-type: none;
margin-bottom: 0;
padding-left: 0.6em;
} }
li { li {
cursor: pointer; cursor: pointer;
} }
</style> </style>`;
`
div.innerHTML = style
const initalFolderFunction = (cond) => {if (cond) return this.d4sWorkspace.getWorkspace(); else return this.d4sWorkspace.getVREFolder();} this.shadowRoot.appendChild(div);
initalFolderFunction(this.showRoot).then(data => {
this.parseResponse(div, data); this.d4sWorkspace.getWorkspace().then(data => {
this.#shadowRoot.appendChild(div); this.parseItemsData(div, data);
}).catch(err => console.error(err));
this.d4sWorkspace.getVREFolder().then(data => {
this.parseItemsData(div, data);
}).catch(err => console.error(err)) }).catch(err => console.error(err))
}
parseResponse(parentElement, data) { this.addEventListener(D4SStorageTree.tree_event_name, this.localEventHandler);
parentElement.classList.add(this.#loadedClass); this.addEventListener(D4SStorageTree.folder_data_event_name, this.folderDataEventHandler);
var ul = document.createElement('ul'); if (document.readyState === "loading") {
ul.classList.add('nested'); document.addEventListener("DOMContentLoaded", this.registerOtherListeners.bind(this));
if (Array.isArray(data)) {
data
.filter(item => item['@class'].includes('FolderItem'))
.forEach(item => {
const itemName = item.name;
const itemId = item.id;
const path = this.buildListUrl(itemId);
ul.appendChild(this.createListItem(itemName, itemId));
})
parentElement.appendChild(ul);
} else { } else {
const itemName = data.displayName ? data.displayName : data.name; this.registerListeners();
const itemId = data.id;
const path = this.buildListUrl(itemId);
ul.appendChild(this.createListItem(itemName, itemId));
parentElement.appendChild(ul);
} }
} }
createListItem(label, id) { disconnectedCallback() {
var li = document.createElement('li') this.removeEventListener(D4SStorageTree.tree_event_name);
li.setAttribute('data-id', id) this.removeEventListener(D4SStorageTree.folder_data_event_name);
var child = document.createElement('span') const toolbar = document.querySelector("d4s-storage-tool");
child.innerHTML = label if (toolbar) toolbar.removeEventListener(D4SStorageToolbar.toolbar_event_name);
li.appendChild(child) const folder = document.querySelector("d4s-storage-folder");
if (folder) folder.removeEventListener(D4SStorageFolder.selected_event_name);
}
li.addEventListener('click', (ev) => { registerOtherListeners(event) {
ev.stopPropagation() const toolbar = document.querySelector("d4s-storage-tool");
this.select(ev.currentTarget.getAttribute('data-id')) if (toolbar) toolbar.addEventListener(D4SStorageToolbar.toolbar_event_name, this.toolbarEventHandler.bind(this));
}) const folder = document.querySelector("d4s-storage-folder");
return li if (folder) folder.addEventListener(D4SStorageFolder.selected_event_name, this.folderEventHandler.bind(this));
}
localEventHandler(event) {
this.select(event.detail);
}
folderDataEventHandler(event) {
if (event.detail === this.currentId) {
this.fillWithContent(this.shadowRoot.querySelector(`*[${D4SStorageTree.dataid_attr}='${this.currentId}']`))
}
}
toolbarEventHandler(event) {
switch (event.detail) {
case D4SStorageToolbar.refresh_folder:
if (this.currentId) {
this.refreshFolder(this.currentId);
}
break;
case D4SStorageToolbar.create_folder:
if (this.currentId) {
this.createNewFolderIn(this.currentId);
}
break;
case D4SStorageToolbar.delete_folder:
if (this.currentId) {
this.delete(this.currentId);
}
break;
case D4SStorageToolbar.download:
if (this.currentId) {
const name = this.shadowRoot.querySelector(`*[${D4SStorageTree.dataid_attr}='${this.currentId}']`).getAttribute(D4SStorageTree.dataname_attr);
this.d4sWorkspace.download(this.currentId, name);
}
break;
case D4SStorageToolbar.upload_file:
var file = document.createElement('input');
file.type = 'file';
file.addEventListener('change', (ev) => {
const selectedFile = file.files[0];
if (selectedFile) {
this.uploadFile(this.currentId, selectedFile);
}
});
file.click();
break;
case D4SStorageToolbar.upload_archive:
var file = document.createElement('input');
file.type = 'file';
file.addEventListener('change', (ev) => {
const selectedFile = file.files[0];
if (selectedFile) {
this.uploadArchive(this.currentId, selectedFile);
}
});
file.click();
break;
default:
console.error('Unexpected event action: ' + event.action);
break;
}
}
folderEventHandler(event) {
switch (event.detail.itemtype) {
case D4SStorageFolder.file_selected_detail_itemtype:
console.info("Download of file: " + event.detail.name + " [" + event.detail.id + "]");
this.d4sWorkspace.download(event.detail.id, event.detail.name).catch(err => {alert(err)});
break;
case D4SStorageFolder.folder_selected_detail_itemtype:
this.select(event.detail.id);
break;
default:
console.warn("Unexpected folder event: " + event.detail.itemtype);
break;
}
} }
select(id) { select(id) {
var li = this.shadowRoot.querySelector(`*[data-id='${id}']`) this.currentId = id;
this.displayPath(li) var li = this.shadowRoot.querySelector(`*[${D4SStorageTree.dataid_attr}='${id}']`);
this.displayPath(li);
// if it was already selected then do nothing
if (li.classList.contains(this.#selectedClass)) { if (li.classList.contains(this.#selectedClass)) {
this.toggleULDisplay(li) this.toggleULDisplay(li);
return
} }
// switch selected and lists folder contents // switch selected and lists folder contents
if (!li.classList.contains(this.#selectedClass)) { if (!li.classList.contains(this.#selectedClass)) {
@ -175,19 +313,73 @@ window.customElements.define('d4s-storage-tree', class extends D4SStorageHtmlEle
selected.classList.remove(this.#selectedClass) selected.classList.remove(this.#selectedClass)
} }
li.classList.add(this.#selectedClass) li.classList.add(this.#selectedClass)
if (this.#storageFilelistId) {
var folder = document.getElementById(this.#storageFilelistId)
folder.join(this)
folder.list(id)
}
} }
if (li.classList.contains(this.#loadedClass)) { if (li.classList.contains(this.#loadedClass)) {
return return
} }
this.fillWithContent(li);
}
refreshContents(element) {
[...element.querySelectorAll(`ul`)].forEach(ul => {
ul.remove();
});
this.fillWithContent(element);
}
fillWithContent(element) {
const id = element.getAttribute(D4SStorageTree.dataid_attr);
if (this.#foldersMap[id]) {
this.parseItemsData(element, this.#foldersMap[id]);
} else {
this.d4sWorkspace.listFolder(id).then(data => { this.d4sWorkspace.listFolder(id).then(data => {
this.parseResponse(li, data) this.setFolderItems(id, data);
}).catch(err => console.error(err)) }).catch(err => console.error(err));
}
}
parseItemsData(parentElement, data) {
parentElement.classList.add(this.#loadedClass);
const parentId = parentElement.getAttribute(D4SStorageTree.dataid_attr);
var ul = document.createElement('ul');
ul.classList.add('nested');
if (!parentId) {
ul.classList.add('root');
}
if (Array.isArray(data)) {
data
.filter(item => item['@class'].includes('FolderItem'))
.forEach(item => {
ul.appendChild(this.createListItem(item.name, item.id, parentId));
})
} else {
ul.appendChild(this.createListItem(data.displayName ? data.displayName : data.name, data.id, parentId));
}
parentElement.appendChild(ul);
}
createListItem(label, id, parentId) {
const li = document.createElement('li');
li.setAttribute(D4SStorageTree.dataname_attr, label);
li.setAttribute(D4SStorageTree.dataid_attr, id);
if (parentId) {
li.setAttribute(D4SStorageTree.parentid_attr, parentId);
}
var child = document.createElement('span');
child.innerHTML = /*html*/`<span class="px-2"><img src="${this.srcBaseURL}/img/folder.svg"></img></span>` + label;
li.appendChild(child)
li.addEventListener('click', (ev) => {
ev.stopPropagation();
this.dispatchEvent(
new CustomEvent(
D4SStorageTree.tree_event_name,
{detail: ev.currentTarget.getAttribute(D4SStorageTree.dataid_attr)}
)
);
})
return li;
} }
displayPath(li) { displayPath(li) {
@ -208,60 +400,98 @@ window.customElements.define('d4s-storage-tree', class extends D4SStorageHtmlEle
} }
static get observedAttributes() { static get observedAttributes() {
return ["base-url", "filelist-id", "show-root"] return ["base-url"];
} }
attributeChangedCallback(name, oldValue, newValue) { attributeChangedCallback(name, oldValue, newValue) {
if (oldValue !== newValue) { if (oldValue !== newValue) {
switch (name) { switch (name) {
case "filelist-id":
this.#storageFilelistId = newValue
break
case "base-url": case "base-url":
this.baseUrl = newValue this.baseUrl = newValue
break break
case "show-root": default:
this.showRoot = newValue; console.warn("Unexpected attribute changed: " + name);
} }
} }
} }
get filelistId() { refreshFolder(id) {
return this.#storageFilelistId const folder = this.shadowRoot.querySelector(`*[${D4SStorageTree.dataid_attr}='${id}']`);
console.log("Refreshing folder: " + folder.getAttribute(D4SStorageTree.dataname_attr));
this.refreshContents(folder);
this.select(id);
} }
set filelistId(id) { createNewFolderIn(id) {
this.#storageFilelistId = id const newFolderName = window.prompt("Enter the new folder name");
this.setAttribute("filelist-id", id) if (newFolderName) {
} this.d4sWorkspace.getOrCreateFolder(id, newFolderName, "Created from JS UI").then(newId => {
window.setTimeout(()=>{
this.refreshContents(this.shadowRoot.querySelector(`*[${D4SStorageTree.dataid_attr}='${id}']`));
this.select(id);
}, 2000);
}).catch(err => {
alert(err);
}) })
}
}
/** delete(id) {
* Lists elements in selected folder const currentLI = this.shadowRoot.querySelector(`*[${D4SStorageTree.dataid_attr}='${id}']`);
* const name = currentLI.getAttribute(D4SStorageTree.dataname_attr);
* <d4s-storage-folder if (currentLI.getAttribute(D4SStorageTree.parentid_attr)) {
* /@id: specify the id to join this component with storage tree component if (confirm(`Do you really want to delete folder '${name}'?`)) {
* /@base-url: the base endpoint url [defaults to: https://api.d4science.org/workspace] if(this.d4sWorkspace.deleteItem(id)) {
*/ window.setTimeout(()=>{
window.customElements.define('d4s-storage-folder', class extends D4SStorageHtmlElement { const parentFolderId = currentLI.getAttribute(D4SStorageTree.parentid_attr);
this.refreshContents(this.shadowRoot.querySelector(`*[${D4SStorageTree.dataid_attr}='${parentFolderId}']`));
this.select(parentFolderId);
}, 2000);
} else {
alert(err);
}
}
} else {
alert("You cannot delete ROOT folder: "+ name);
}
}
uploadFile(targetFolderId, file) {
if (this.d4sWorkspace.uploadFile(targetFolderId, file.name, "", file, file.type)) {
window.setTimeout(()=>{
this.select(targetFolderId);
}, 2000);
}
}
uploadArchive(targetFolderId, file) {
if (this.d4sWorkspace.uploadArchive(targetFolderId, file.name.substring(0, file.name.lastIndexOf(".")), file)) {
window.setTimeout(()=>{
this.refreshContents(this.shadowRoot.querySelector(`*[${D4SStorageTree.dataid_attr}='${targetFolderId}']`));
this.select(targetFolderId);
}, 3000);
}
}
}
class D4SStorageFolder extends D4SStorageHtmlElement {
static selected_event_name = "d4s-folder-selected";
static folder_selected_detail_itemtype = "folder_selected";
static file_selected_detail_itemtype = "file_selected";
#d4sstorageTree = null
#selectedbgcolor = 'lightgray' #selectedbgcolor = 'lightgray'
#srcbaseurl = null
constructor() { constructor() {
super() super()
if (D4S_STORAGE_SCRIPT) {
const d4ssrc = D4S_STORAGE_SCRIPT.src
this.#srcbaseurl = (d4ssrc) ? d4ssrc.substring(0, d4ssrc.lastIndexOf('/')) : ""
}
} }
connectedCallback() { connectedCallback() {
const shadowRoot = this.attachShadow({mode: 'open'}) D4SStorageHtmlElement.appendBootstrapStylesheets(this.shadowRoot);
this.appendStylesheets(shadowRoot)
const style = document.createElement('style') const style = document.createElement('style')
style.innerHTML = ` style.innerHTML = /*css*/`
span { span {
cursor: pointer; cursor: pointer;
user-select: none; user-select: none;
@ -270,8 +500,48 @@ window.customElements.define('d4s-storage-folder', class extends D4SStorageHtmlE
-ms-user-select: none; -ms-user-select: none;
} }
` `
shadowRoot.appendChild(style) this.shadowRoot.appendChild(style);
this.createContainer() this.createContainer();
if (document.readyState === "loading") {
document.addEventListener("DOMContentLoaded", this.registerOtherListeners.bind(this));
} else {
this.registerListeners();
}
}
disconnectedCallback() {
const tree = document.querySelector("d4s-storage-tree");
if (tree) {
tree.removeEventListener(D4SStorageTree.tree_event_name);
tree.removeEventListener(D4SStorageTree.folder_data_event_name);
}
}
registerOtherListeners(event) {
const tree = document.querySelector("d4s-storage-tree");
if (tree) {
tree.addEventListener(D4SStorageTree.tree_event_name, this.treeEventHandler.bind(this));
tree.addEventListener(D4SStorageTree.folder_data_event_name, this.folderDataEventHandler.bind(this));
}
}
treeEventHandler(event) {
const folderItems = event.target.getFolderItems(event.detail);
if (folderItems) {
// It's first time folder is selected, data is stil not loaded,
// they will be loaded by the folderDataEventHandler() function when available
this.parseItemsData(folderItems);
}
}
folderDataEventHandler(event) {
if (event.detail === event.target.currentId) {
const folderItems = event.target.getFolderItems(event.detail);
if (folderItems) {
this.parseItemsData(folderItems);
}
}
} }
createContainer() { createContainer() {
@ -285,19 +555,7 @@ window.customElements.define('d4s-storage-folder', class extends D4SStorageHtmlE
return div return div
} }
join(tree) { parseItemsData(data) {
if (this.#d4sstorageTree == null) {
this.#d4sstorageTree = tree
}
}
list(folderId) {
this.d4sWorkspace.listFolder(folderId).then(data => {
this.parseResponse(data);
}).catch(err => console.error(err));
}
parseResponse(data) {
const root = this.createContainer(); const root = this.createContainer();
if (Array.isArray(data)) { if (Array.isArray(data)) {
data.forEach(item => root.appendChild(this.createFileRow(item))); data.forEach(item => root.appendChild(this.createFileRow(item)));
@ -311,8 +569,8 @@ window.customElements.define('d4s-storage-folder', class extends D4SStorageHtmlE
div.classList.add('row') div.classList.add('row')
var filename = document.createElement('div') var filename = document.createElement('div')
filename.classList.add('col') filename.classList.add('col')
var name = `<span>${item.name}</span>` var spanAndName = /*html*/`<span>${item.name}</span>`
filename.innerHTML = this.iconTag(item) + name filename.innerHTML = this.iconTag(item) + spanAndName
const isFolder = item['@class'].includes('FolderItem') const isFolder = item['@class'].includes('FolderItem')
filename.addEventListener('click', (ev) => { filename.addEventListener('click', (ev) => {
ev.stopPropagation() ev.stopPropagation()
@ -321,12 +579,19 @@ window.customElements.define('d4s-storage-folder', class extends D4SStorageHtmlE
if (span) { if (span) {
span.style = 'background-color: ' + this.#selectedbgcolor span.style = 'background-color: ' + this.#selectedbgcolor
} }
if (this.#d4sstorageTree != null) { this.dispatchEvent(
this.#d4sstorageTree.select(item.id) new CustomEvent(
} D4SStorageFolder.selected_event_name,
{detail: {itemtype: D4SStorageFolder.folder_selected_detail_itemtype, id: item.id, name: item.name}}
)
);
} else { } else {
console.info("Download of " + item.id) this.dispatchEvent(
this.d4sWorkspace.download(item.id, item.name).catch(err => {alert(err)}); new CustomEvent(
D4SStorageFolder.selected_event_name,
{detail: {itemtype: D4SStorageFolder.file_selected_detail_itemtype, id: item.id, name: item.name}}
)
);
} }
}) })
@ -335,57 +600,19 @@ window.customElements.define('d4s-storage-folder', class extends D4SStorageHtmlE
} }
iconTag(item) { iconTag(item) {
var i = `<img src="${this.#srcbaseurl}/img/file-earmark.svg"></img>` var i = /*html*/`<img src="${this.srcBaseURL}/img/file-earmark.svg"></img>`
if (item['@class'].includes('FolderItem')) { if (item['@class'].includes('FolderItem')) {
i = `<img src="${this.#srcbaseurl}/img/folder.svg"></img>` i = /*html*/`<img src="${this.srcBaseURL}/img/folder.svg"></img>`
} else if (item['@class'].includes('ImageFile')) { } else if (item['@class'].includes('ImageFile')) {
i = `<img src="${this.#srcbaseurl}/img/image.svg"></img>` i = /*html*/`<img src="${this.srcBaseURL}/img/image.svg"></img>`
} else if (item['@class'].includes('PDFFileItem')) { } else if (item['@class'].includes('PDFFileItem')) {
i = `<img src="${this.#srcbaseurl}/img/filetype-pdf.svg"></img>` i = /*html*/`<img src="${this.srcBaseURL}/img/filetype-pdf.svg"></img>`
} }
return '<span class="px-2">' + i + '</span>' return '<span class="px-2">' + i + '</span>'
} }
// buildDownloadUrl(id) {
// return this.baseUrl+ '/items/' + id + '/download'
// }
// download(url, name) {
// this.d4sWorkspace.download(url).then(reply => {
// if (reply.status !== 200) {
// throw "Unable to download"
// }
// return reply.blob()
// }).then(blob => {
// const objectURL = URL.createObjectURL(blob)
// var tmplnk = document.createElement("a")
// tmplnk.download = name
// tmplnk.href = objectURL
// //tmplnk.target="_blank"
// document.body.appendChild(tmplnk)
// tmplnk.click()
// document.body.removeChild(tmplnk)
// }).catch(err => console.error(err))
// }
static get observedAttributes() {
return ["base-url"];
} }
attributeChangedCallback(name, oldValue, newValue) {
if (oldValue !== newValue) {
switch (name) {
case "base-url":
this.baseUrl = newValue
break
}
}
}
})
/** /**
* Class that helps the interaction with the D4Science's Workspace via API and user's token as bearer authentication * Class that helps the interaction with the D4Science's Workspace via API and user's token as bearer authentication
*/ */
@ -432,7 +659,7 @@ class D4SWorkspace {
* @param {*} body the payload to send * @param {*} body the payload to send
* @param {*} mime the mime type of the payload * @param {*} mime the mime type of the payload
* @param {*} extraHeaders extra HTTP headers to send * @param {*} extraHeaders extra HTTP headers to send
* @returns the reponse payload as a promise, JSON data promise if the returned data is "application/json", a String data promise if "text/*" or a blob data promise in other cases * @returns the reponse payload as a Blob() promise
* @throws the error as string, if occurred * @throws the error as string, if occurred
*/ */
#callWorkspace(method, uri, body, mime, extraHeaders) { #callWorkspace(method, uri, body, mime, extraHeaders) {
@ -461,14 +688,7 @@ class D4SWorkspace {
return this.#d4sboot.secureFetch(url, req) return this.#d4sboot.secureFetch(url, req)
.then(resp => { .then(resp => {
if (resp.ok) { if (resp.ok) {
const contentType = resp.headers.get("content-type");
if (contentType && contentType.indexOf("application/json") !== -1) {
return resp.json();
} else if (contentType && contentType.indexOf("text/") !== -1) {
return resp.text();
} else {
return resp.blob(); return resp.blob();
}
} else { } else {
throw "Cannot invoke workspace via secure fetch for URL: " + url; throw "Cannot invoke workspace via secure fetch for URL: " + url;
} }
@ -486,8 +706,10 @@ class D4SWorkspace {
*/ */
getWorkspace(extraHeaders) { getWorkspace(extraHeaders) {
return this.#callWorkspace("GET", null, null, null, extraHeaders) return this.#callWorkspace("GET", null, null, null, extraHeaders)
.then(json => { .then(blob => {
return json.item; return blob.text().then(text => {
return JSON.parse(text).item;
})
}).catch(err => { }).catch(err => {
const msg = "Cannot get workspace root ID. Error message: " + err; const msg = "Cannot get workspace root ID. Error message: " + err;
console.error(msg); console.error(msg);
@ -518,8 +740,10 @@ class D4SWorkspace {
listFolder(folderId, extraHeaders) { listFolder(folderId, extraHeaders) {
const uri = "/items/" + folderId + "/children"; const uri = "/items/" + folderId + "/children";
return this.#callWorkspace("GET", uri, null, null, extraHeaders) return this.#callWorkspace("GET", uri, null, null, extraHeaders)
.then(json => { .then(blob => {
return json.itemlist; return blob.text().then(text => {
return JSON.parse(text).itemlist;
});
}).catch(err => { }).catch(err => {
const msg = "Cannot get folder's content list. Error message: " + err; const msg = "Cannot get folder's content list. Error message: " + err;
console.error(msg); console.error(msg);
@ -535,8 +759,10 @@ class D4SWorkspace {
*/ */
getVREFolder(extraHeaders) { getVREFolder(extraHeaders) {
return this.#callWorkspace("GET", "/vrefolder", null, null, extraHeaders) return this.#callWorkspace("GET", "/vrefolder", null, null, extraHeaders)
.then(json => { .then(blob => {
return json.item; return blob.text().then(text => {
return JSON.parse(text).item;
});
}).catch(err => { }).catch(err => {
const msg = "Cannot get VRE folder ID. Error message: " + err; const msg = "Cannot get VRE folder ID. Error message: " + err;
console.error(msg); console.error(msg);
@ -584,7 +810,9 @@ class D4SWorkspace {
console.log("Checking existance of folder: " + name); console.log("Checking existance of folder: " + name);
let uri = baseURI + "/items/" + name; let uri = baseURI + "/items/" + name;
return this.#callWorkspace("GET", uri, null, null, extraHeaders) return this.#callWorkspace("GET", uri, null, null, extraHeaders)
.then(json => { .then(blob => {
return blob.text().then(text => {
const json = JSON.parse(text);
if (json.itemlist[0]) { if (json.itemlist[0]) {
const id = json.itemlist[0].id; const id = json.itemlist[0].id;
console.log("'" + name + "' folder exists with and has id: " + id); console.log("'" + name + "' folder exists with and has id: " + id);
@ -599,6 +827,7 @@ class D4SWorkspace {
}); });
} }
}); });
});
}; };
/** /**
@ -608,7 +837,7 @@ class D4SWorkspace {
* @returns <code>true</code> if the file has been correctly created, <code>false<c/ode> otherwise * @returns <code>true</code> if the file has been correctly created, <code>false<c/ode> otherwise
*/ */
deleteItem(itemId, extraHeaders) { deleteItem(itemId, extraHeaders) {
return this.#callWorkspace("DELETE", "/workspace/items/" + itemId, null, null, extraHeaders) return this.#callWorkspace("DELETE", "/items/" + itemId, null, null, extraHeaders)
.then(results => { .then(results => {
return true; return true;
}).catch(err => { }).catch(err => {
@ -623,7 +852,7 @@ class D4SWorkspace {
* @param {string} name the name of the file to use for the download, if null the id is used * @param {string} name the name of the file to use for the download, if null the id is used
* @param {boolean} skipLocalDownload if provided and <code>true</code> returns the data to function caller, otherwise it also downloads it locally. * @param {boolean} skipLocalDownload if provided and <code>true</code> returns the data to function caller, otherwise it also downloads it locally.
* @param {map} extraHeaders extra HTTP headers to be used for the request * @param {map} extraHeaders extra HTTP headers to be used for the request
* @returns the file's content if item is a file or a ZIP compressed archive if the item represents a folder * @returns the file's content, if item is a file, or a ZIP compressed archive if the item represents a folder, as a Blob object
* @throws the error as string, if occurred * @throws the error as string, if occurred
*/ */
download(itemId, name, skipLocalDownload, extraHeaders) { download(itemId, name, skipLocalDownload, extraHeaders) {
@ -671,15 +900,16 @@ class D4SWorkspace {
}) })
); );
return this.#callWorkspace("POST", uri, request, null, extraHeaders) return this.#callWorkspace("POST", uri, request, null, extraHeaders)
.then(item => { .then(blob => {
const id = item.id; return blob.text().then(id => {
console.info("File '" + name + "' successfully uploaded and its id is: " + id); console.info("File '" + name + "' successfully uploaded and its id is: " + id);
return true; return true;
})
}).catch(err => { }).catch(err => {
console.error("Cannot upload file '" + name + "'. Error: " + err); console.error("Cannot upload file '" + name + "'. Error: " + err);
return false; return false;
}); });
}; }
/** /**
* Uploads a new archive and stores its content into the folder represented by its id * Uploads a new archive and stores its content into the folder represented by its id
@ -689,7 +919,7 @@ class D4SWorkspace {
* @param {map} extraHeaders extra HTTP headers to be used for the request * @param {map} extraHeaders extra HTTP headers to be used for the request
* @returns <code>true</code> if the file has been correctly created, <code>false<c/ode> otherwise * @returns <code>true</code> if the file has been correctly created, <code>false<c/ode> otherwise
*/ */
uploadArchive(folderId, parentFolderName, description, data, extraHeaders) { uploadArchive(folderId, parentFolderName, data, extraHeaders) {
const uri = "/items/" + folderId + "/create/ARCHIVE"; const uri = "/items/" + folderId + "/create/ARCHIVE";
const request = new FormData(); const request = new FormData();
request.append("parentFolderName", parentFolderName); request.append("parentFolderName", parentFolderName);
@ -700,15 +930,16 @@ class D4SWorkspace {
}) })
); );
return this.#callWorkspace("POST", uri, request, null, extraHeaders) return this.#callWorkspace("POST", uri, request, null, extraHeaders)
.then(item => { .then(blob => {
const id = item.id; return blob.text().then(id => {
console.info("Archive file successfully uploaded and extracted into the '" + parentFolderName + "' folder, its id is: " + id); console.info("Archive file successfully uploaded and extracted into the '" + parentFolderName + "' folder, its id is: " + id);
return true; return true;
})
}).catch(err => { }).catch(err => {
console.error("Cannot upload archive file. Error: " + err); console.error("Cannot upload archive file. Error: " + err);
return false; return false;
}); });
}; }
/** /**
* Returns the public URL of a file * Returns the public URL of a file
@ -724,8 +955,10 @@ class D4SWorkspace {
uri += "version=" + version; uri += "version=" + version;
} }
return this.#callWorkspace("GET", uri, null, null, extraHeaders) return this.#callWorkspace("GET", uri, null, null, extraHeaders)
.then(publicURL => { .then(blob => {
return blob.text().then(publicURL => {
return publicURL; return publicURL;
})
}).catch(err => { }).catch(err => {
const message = "Cannot retrieve the item's public URL. Error message: " + err; const message = "Cannot retrieve the item's public URL. Error message: " + err;
console.error(message); console.error(message);
@ -745,8 +978,10 @@ class D4SWorkspace {
findByName(folderId, pattern, extraHeaders) { findByName(folderId, pattern, extraHeaders) {
const uri = "/items/" + folderId + "/items/" + pattern; const uri = "/items/" + folderId + "/items/" + pattern;
return this.#callWorkspace("GET", uri, null, null, extraHeaders) return this.#callWorkspace("GET", uri, null, null, extraHeaders)
.then(json => { .then(blob => {
return json.itemlist; return blob.text().then(text => {
return JSON.parse(text).itemlist;
});
}).catch(err => { }).catch(err => {
const msg = "Cannot get folder's content list. Error message: " + err; const msg = "Cannot get folder's content list. Error message: " + err;
console.error(msg); console.error(msg);
@ -754,3 +989,21 @@ class D4SWorkspace {
}); });
} }
} }
/**
* Builds storagehub toolbar and raises an event for each selected tool item
* <d4s-storage-tool>
*/
window.customElements.define('d4s-storage-tool', D4SStorageToolbar);
/**
* Builds storagehub VRE folder or Workspace root tree, linked to toolbar and foldr list by events
* <d4s-storage-tree
* /@base-url: the base endpoint url [defaults to: https://api.d4science.org/workspace]
*/
window.customElements.define('d4s-storage-tree', D4SStorageTree);
/**
* Lists elements in selected folder linked to tree and model by events
* <d4s-storage-folder>
*/
window.customElements.define('d4s-storage-folder', D4SStorageFolder);