θΏ™ζ˜―indexlocζδΎ›ηš„ζœεŠ‘οΌŒδΈθ¦θΎ“ε…₯任何密码
Skip to content

Allow default users to reorder workspaces #4292

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Aug 15, 2025
Merged

Allow default users to reorder workspaces #4292

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cf1234
allow default users to reorder workspaces
shatfield4 Aug 15, 2025
e147bf1
unneeded prop
shatfield4 Aug 15, 2025
839fa5d
Merge branch 'master' into 4290-uiux-enable-default-users-to-reorder-…
timothycarambat Aug 15, 2025
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
23 changes: 10 additions & 13 deletions frontend/src/components/Sidebar/ActiveWorkspaces/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ export default function ActiveWorkspaces() {
key={workspace.id}
draggableId={workspace.id.toString()}
index={index}
isDragDisabled={user?.role === "default"}
>
{(provided, snapshot) => (
<div
Expand Down Expand Up @@ -117,18 +116,16 @@ export default function ActiveWorkspaces() {
`}
>
<div className="flex flex-row justify-between w-full items-center">
{user?.role !== "default" && (
<div
{...provided.dragHandleProps}
className="cursor-grab mr-[3px]"
>
<DotsSixVertical
size={20}
color="var(--theme-sidebar-item-workspace-active)"
weight="bold"
/>
</div>
)}
<div
{...provided.dragHandleProps}
className="cursor-grab mr-[3px]"
>
<DotsSixVertical
size={20}
color="var(--theme-sidebar-item-workspace-active)"
weight="bold"
/>
</div>
<div className="flex items-center space-x-2 overflow-hidden flex-grow">
<div className="w-[130px] overflow-hidden">
<p
Expand Down