Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ [Frontend] Drag&Drop: Projects and Folders #6957

Merged
merged 76 commits into from
Dec 16, 2024
Merged
Changes from 1 commit
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
565681c
set layout first
odeimaiz Dec 12, 2024
20e3f3d
isValidWidget
odeimaiz Dec 12, 2024
955bf5d
[skip ci] ToggleButton -> Widget
odeimaiz Dec 12, 2024
be05ce1
[skip ci] minor
odeimaiz Dec 12, 2024
e5affe5
[skip ci] tap service button
odeimaiz Dec 12, 2024
011f9de
[skip ci] don't listen to change value
odeimaiz Dec 12, 2024
84ba8f7
[skip ci] __evalSelectedButton
odeimaiz Dec 12, 2024
7b89f36
Merge branch 'master' into feature/daraga-doropa
odeimaiz Dec 12, 2024
23a0aae
empty specific-info by default
odeimaiz Dec 12, 2024
4302f5d
not needed
odeimaiz Dec 12, 2024
b0e51d5
[skip ci] minor
odeimaiz Dec 12, 2024
8719ce8
simpler
odeimaiz Dec 12, 2024
63d496b
minors
odeimaiz Dec 12, 2024
dea32d2
refactor
odeimaiz Dec 12, 2024
4f6f2b5
[skip ci] minor
odeimaiz Dec 12, 2024
fdc8a5c
[skip ci] cleanup
odeimaiz Dec 12, 2024
7850d4f
rename files
odeimaiz Dec 12, 2024
fe21854
[skip ci] rename
odeimaiz Dec 12, 2024
0e44843
[skip ci] renaming
odeimaiz Dec 12, 2024
44713c9
prettifyMenus
odeimaiz Dec 12, 2024
288ef49
[skip ci] multiselection working
odeimaiz Dec 13, 2024
a51fc68
support null first and last name
odeimaiz Dec 13, 2024
744d96f
[skip ci] attachDragHandlers and attachDropHandlers
odeimaiz Dec 13, 2024
4022440
Merge branch 'master' into feature/daraga-doropa
odeimaiz Dec 13, 2024
1f68f7c
[skip ci] minor
odeimaiz Dec 13, 2024
35ab99d
Merge branch 'feature/daraga-doropa' of github.com:odeimaiz/osparc-si…
odeimaiz Dec 13, 2024
b560585
[skip ci] pass ordingin info in drag event
odeimaiz Dec 13, 2024
3a5bd4a
[skip ci] compatibility checks
odeimaiz Dec 13, 2024
c3622d0
move working
odeimaiz Dec 13, 2024
b3833b5
wire signals
odeimaiz Dec 13, 2024
1ff160a
[skip ci] minor
odeimaiz Dec 13, 2024
10ebce4
move study working
odeimaiz Dec 13, 2024
03f7f0f
Merge branch 'master' into feature/daraga-doropa
odeimaiz Dec 13, 2024
451f3bb
minor
odeimaiz Dec 13, 2024
884f833
not needed
odeimaiz Dec 13, 2024
afe48e5
list items are not toggle buttons
odeimaiz Dec 13, 2024
ed57fb4
smaller TIP disclaimer
odeimaiz Dec 15, 2024
0513e3e
prettify listbuttonitem menu
odeimaiz Dec 15, 2024
97cc262
bgColor
odeimaiz Dec 15, 2024
d61362f
minor
odeimaiz Dec 15, 2024
60037a2
dragIndicator
odeimaiz Dec 15, 2024
1f8f1b9
DragWidget
odeimaiz Dec 15, 2024
2b775c8
folders also use dragWidget
odeimaiz Dec 15, 2024
63fdfdb
highlight folder icon
odeimaiz Dec 15, 2024
da61500
no cursor
odeimaiz Dec 15, 2024
c9926b7
dragdrop-own-cursor
odeimaiz Dec 15, 2024
56b097b
minor aesthetics
odeimaiz Dec 15, 2024
eafb08e
dragend resetTextColor
odeimaiz Dec 15, 2024
a830add
minor
odeimaiz Dec 15, 2024
a847164
setDropAllowed
odeimaiz Dec 15, 2024
1b7d5b8
minor
odeimaiz Dec 15, 2024
3d2361e
renaming
odeimaiz Dec 15, 2024
0f36355
dragStartFolder and dragEnd
odeimaiz Dec 15, 2024
b5b579e
DragDropHelpers
odeimaiz Dec 15, 2024
4a28028
refactor
odeimaiz Dec 15, 2024
839410d
refactoring
odeimaiz Dec 15, 2024
be5def7
refactor
odeimaiz Dec 15, 2024
a7e87c0
dragOver and drop
odeimaiz Dec 15, 2024
4cd636e
more refactoring
odeimaiz Dec 15, 2024
fbc0e42
wirte resourceToFolderRequested
odeimaiz Dec 15, 2024
623a396
dragOver logic
odeimaiz Dec 15, 2024
3031392
checks correct
odeimaiz Dec 15, 2024
5f51f87
minor
odeimaiz Dec 15, 2024
06cef92
minor
odeimaiz Dec 15, 2024
f0a305e
minor
odeimaiz Dec 15, 2024
4652068
minor
odeimaiz Dec 15, 2024
2bfd6d9
signature
odeimaiz Dec 15, 2024
88ed670
__doMoveFolder
odeimaiz Dec 15, 2024
1de0288
moving folders
odeimaiz Dec 15, 2024
96d937e
one more check
odeimaiz Dec 15, 2024
8148f72
doMoveStudy
odeimaiz Dec 15, 2024
5de4500
minor fix
odeimaiz Dec 15, 2024
4bcfe9e
draggingOver
odeimaiz Dec 15, 2024
d9260ed
minor
odeimaiz Dec 15, 2024
a9b5bfc
highlilight compatible icons
odeimaiz Dec 15, 2024
dc30231
Merge branch 'master' into feature/daraga-doropa
odeimaiz Dec 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
renaming
odeimaiz committed Dec 15, 2024
commit 3d2361e31595c5a9700bc54ac2f17b6e7e3720a6
Original file line number Diff line number Diff line change
@@ -217,9 +217,9 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
// - None
// - Shared workspace
// - write access on workspace
const folder = e.getData("osparc-moveFolder")["folderOrigin"];
compatible = this.getFolder() !== folder;
const workspaceId = folder.getWorkspaceId();
const folderOrigin = e.getData("osparc-moveFolder")["folderOrigin"];
compatible = this.getFolder() !== folderOrigin;
const workspaceId = folderOrigin.getWorkspaceId();
if (compatible) {
if (workspaceId) {
const workspace = osparc.store.Workspaces.getInstance().getWorkspace(workspaceId);
@@ -262,9 +262,9 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
};
this.fireDataEvent("studyToFolderRequested", studyToFolderData);
} else if (e.supportsType("osparc-moveFolder")) {
const folder = e.getData("osparc-moveFolder")["folderOrigin"];
const folderOrigin = e.getData("osparc-moveFolder")["folderOrigin"];
const folderToFolderData = {
folderId: folder.getFolderId(),
folderId: folderOrigin.getFolderId(),
destFolderId: this.getFolderId(),
};
this.fireDataEvent("folderToFolderRequested", folderToFolderData);