Skip to content

Commit b3833b5

Browse files
committed
wire signals
1 parent c3622d0 commit b3833b5

File tree

4 files changed

+35
-18
lines changed

4 files changed

+35
-18
lines changed

services/static-webserver/client/source/class/osparc/dashboard/FolderButtonItem.js

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
5050
"untrashFolderRequested": "qx.event.type.Data",
5151
"deleteFolderRequested": "qx.event.type.Data",
5252
"changeContext": "qx.event.type.Data",
53+
"studyToFolderRequested": "qx.event.type.Data",
54+
"folderToFolderRequested": "qx.event.type.Data",
5355
},
5456

5557
properties: {
@@ -219,22 +221,18 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
219221
this.addListener("drop", e => {
220222
if (e.supportsType("osparc-moveStudy")) {
221223
const studyData = e.getData("osparc-moveStudy")["studyDataOrigin"];
222-
const params = {
223-
url: {
224-
studyId: studyData["uuid"],
225-
folderId: this.getFolderId(),
226-
}
224+
const studyToFolderData = {
225+
studyId: studyData["uuid"],
226+
destFolderId: this.getFolderId(),
227227
};
228-
osparc.data.Resources.fetch("studies", "moveToFolder", params)
229-
.then(() => {
230-
studyData["folderId"] = this.getFolderId();
231-
osparc.FlashMessenger.logAs("Study moved", "INFO");
232-
this.fireDataEvent("studyDroppedToFolder", studyData["uuid"]);
233-
})
234-
.catch(err => {
235-
console.error(err);
236-
osparc.FlashMessenger.logAs(err.message, "ERROR");
237-
});
228+
this.fireDataEvent("studyToFolderRequested", studyToFolderData);
229+
} else if (e.supportsType("osparc-moveFolder")) {
230+
const folder = e.getData("osparc-moveFolder")["folderOrigin"];
231+
const folderToFolderData = {
232+
folderId: folder.getFolderId(),
233+
destFolderId: this.getFolderId(),
234+
};
235+
this.fireDataEvent("folderToFolderRequested", folderToFolderData);
238236
}
239237
});
240238
},

services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserBase.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,8 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
279279
resourcesContainer.addListener("trashFolderRequested", e => this._trashFolderRequested(e.getData()));
280280
resourcesContainer.addListener("untrashFolderRequested", e => this._untrashFolderRequested(e.getData()));
281281
resourcesContainer.addListener("deleteFolderRequested", e => this._deleteFolderRequested(e.getData()));
282+
resourcesContainer.addListener("studyToFolderRequested", e => this._studyToFolderRequested(e.getData()));
283+
resourcesContainer.addListener("folderToFolderRequested", e => this._folderToFolderRequested(e.getData()));
282284
resourcesContainer.addListener("folderSelected", e => {
283285
const folderId = e.getData();
284286
this._folderSelected(folderId);
@@ -524,6 +526,14 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
524526
throw new Error("Abstract method called!");
525527
},
526528

529+
_studyToFolderRequested: function(studyId) {
530+
throw new Error("Abstract method called!");
531+
},
532+
533+
_folderToFolderRequested: function(folderId) {
534+
throw new Error("Abstract method called!");
535+
},
536+
527537
_workspaceSelected: function(workspaceId) {
528538
throw new Error("Abstract method called!");
529539
},

services/static-webserver/client/source/class/osparc/dashboard/ResourceContainerManager.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ qx.Class.define("osparc.dashboard.ResourceContainerManager", {
8383
"untrashWorkspaceRequested": "qx.event.type.Data",
8484
"deleteWorkspaceRequested": "qx.event.type.Data",
8585
"changeContext": "qx.event.type.Data",
86+
"studyToFolderRequested": "qx.event.type.Data",
87+
"folderToFolderRequested": "qx.event.type.Data",
8688
},
8789

8890
statics: {
@@ -429,6 +431,8 @@ qx.Class.define("osparc.dashboard.ResourceContainerManager", {
429431
"untrashFolderRequested",
430432
"deleteFolderRequested",
431433
"changeContext",
434+
"studyToFolderRequested",
435+
"folderToFolderRequested",
432436
].forEach(eName => card.addListener(eName, e => this.fireDataEvent(eName, e.getData())));
433437
return card;
434438
},

services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,14 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
635635
},
636636
// /FOLDERS
637637

638+
_studyToFolderRequested: function(data) {
639+
console.log("studyToFolderRequested", data);
640+
},
641+
642+
_folderToFolderRequested: function(data) {
643+
console.log("folderToFolderRequested", data);
644+
},
645+
638646
__configureStudyCards: function(cards) {
639647
cards.forEach(card => {
640648
card.setMultiSelectionMode(this.getMultiSelection());
@@ -654,9 +662,6 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
654662
"studyDataOrigin": card.getResourceData(),
655663
});
656664
});
657-
card.addListener("droprequest", e => {
658-
console.log("Related of droprequest: " + e.getRelatedTarget());
659-
});
660665
},
661666

662667
__studyCardClicked: function(item, isShiftPressed) {

0 commit comments

Comments
 (0)