Skip to content

Update switcher icons, fix bug makeIconClass, add guid to new workspace name #1444

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
esimkowitz merged 2 commits into from
Dec 10, 2024
Merged

Update switcher icons, fix bug makeIconClass, add guid to new workspace name #1444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6671496
Update switcher icons, fix bug in makeIconClass
esimkowitz Dec 10, 2024
5502a84
add guid to new workspace name
esimkowitz Dec 10, 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
23 changes: 14 additions & 9 deletions frontend/app/tab/workspaceswitcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,20 @@ const colors = [
];

const icons = [
"circle",
"triangle",
"star",
"cube",
"gem",
"chess-knight",
"heart",
"plane",
"bolt",
"solid@cloud",
"moon",
"layer-group",
"rocket",
"shield-cat",
"paw-simple",
"umbrella",
"flask",
"paperclip",
"chart-line",
"graduation-cap",
"mug-hot",
"circle",
];

const ColorSelector = memo(({ colors, selectedColor, onSelect, className }: ColorSelectorProps) => {
Expand Down Expand Up @@ -209,7 +209,12 @@ const WorkspaceSwitcher = () => {

const saveWorkspace = () => {
setObjectValue(
{ ...activeWorkspace, name: "New Workspace", icon: "circle", color: colors[0] },
{
...activeWorkspace,
name: `New Workspace (${activeWorkspace.oid.slice(0, 5)})`,
icon: icons[0],
color: colors[0],
},
undefined,
true
);
Expand Down
2 changes: 1 addition & 1 deletion frontend/util/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ function makeIconClass(icon: string, fw: boolean, opts?: { spin?: boolean; defau
if (icon.match(/^(solid@)?[a-z0-9-]+$/)) {
// strip off "solid@" prefix if it exists
icon = icon.replace(/^solid@/, "");
return clsx(`fa fa-sharp fa-solid fa-${icon}`, fw ? "fa-fw" : null, opts?.spin ? "fa-spin" : null);
return clsx(`fa fa-solid fa-${icon}`, fw ? "fa-fw" : null, opts?.spin ? "fa-spin" : null);
}
if (icon.match(/^regular@[a-z0-9-]+$/)) {
// strip off the "regular@" prefix if it exists
Expand Down