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.

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

fix: Make the "create workspace" option more obvious #4177

Merged
merged 3 commits into from
Oct 22, 2024
Merged

fix: Make the "create workspace" option more obvious #4177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80c93a8
add plus icon to create new workspace option in dropdown
Anish0203 Oct 20, 2024
6f61ed5
change interface of SingleSelect to take icon in options
Anish0203 Oct 22, 2024
05e00e0
Merge remote-tracking branch 'upstream/beta' into feature-distinguish…
Anish0203 Oct 22, 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
12 changes: 11 additions & 1 deletion components/Contributors/AddToContributorInsightDrawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { useRouter } from "next/router";
import { BsGithub } from "react-icons/bs";
import { usePostHog } from "posthog-js/react";
import { safeParse } from "valibot";
import { PlusIcon } from "@heroicons/react/24/outline";
import SingleSelect from "components/atoms/Select/single-select";
import Button from "components/shared/Button/button";
import { fetchApiData } from "helpers/fetchApiData";
Expand Down Expand Up @@ -118,7 +119,16 @@ export default function AddToContributorInsightDrawer({
) : (
<SingleSelect
options={[
{ label: "Create new insight...", value: "new" },
{
label: "Create new insight...",
value: "new",
icon: (
<PlusIcon
style={{ strokeWidth: "3px" }}
className="w-5 text-gray-500 h-5 p-0.5 -ml-1 text-semibold group-hover:bg-orange-100 rounded-md"
/>
),
},
...contributorInsights.map(({ id, name }) => ({
label: name,
value: id,
Expand Down
12 changes: 11 additions & 1 deletion components/Contributors/AddToContributorInsightModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { useRouter } from "next/router";
import { BsGithub } from "react-icons/bs";
import { usePostHog } from "posthog-js/react";
import { safeParse } from "valibot";
import { PlusIcon } from "@heroicons/react/24/outline";
import Card from "components/atoms/Card/card";
import SingleSelect from "components/atoms/Select/single-select";
import { Dialog, DialogContent } from "components/molecules/Dialog/dialog";
Expand Down Expand Up @@ -119,7 +120,16 @@ export default function AddToContributorInsightModal({
) : (
<SingleSelect
options={[
{ label: "Create new insight...", value: "new" },
{
label: "Create new insight...",
value: "new",
icon: (
<PlusIcon
style={{ strokeWidth: "3px" }}
className="w-5 text-gray-500 h-5 p-0.5 -ml-1 text-semibold group-hover:bg-orange-100 rounded-md"
/>
),
},
...contributorInsights.map(({ id, name }) => ({
label: name,
value: id,
Expand Down
12 changes: 11 additions & 1 deletion components/Repositories/AddToWorkspaceModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useEffect, useState } from "react";
import { useRouter } from "next/router";
import { BsGithub } from "react-icons/bs";
import { usePostHog } from "posthog-js/react";
import { PlusIcon } from "@heroicons/react/24/outline";
import Card from "components/atoms/Card/card";
import SingleSelect from "components/atoms/Select/single-select";
import { Dialog, DialogContent } from "components/molecules/Dialog/dialog";
Expand Down Expand Up @@ -114,7 +115,16 @@ export default function AddToWorkspaceModal({ repository, isOpen, onCloseModal,
) : (
<SingleSelect
options={[
{ label: "Create new workspace...", value: "new" },
{
label: "Create new workspace...",
value: "new",
icon: (
<PlusIcon
style={{ strokeWidth: "3px" }}
className="w-5 text-gray-500 h-5 p-0.5 -ml-1 text-semibold group-hover:bg-orange-100 rounded-md"
/>
),
},
...workspaces.map(({ id, name }) => ({
label: name,
value: id,
Expand Down
56 changes: 33 additions & 23 deletions components/atoms/Select/single-select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ interface SingleSelectProps {
onValueChange: (value: string) => void;
placeholder?: string;
inputPlaceholder?: string;
options: { label: string; value: string }[];
options: { label: string; value: string; icon?: React.ReactElement }[];
position?: "popper" | "item-aligned";
isSearchable?: boolean;
insetLabel?: string;
Expand Down Expand Up @@ -90,28 +90,38 @@ const SingleSelect = ({
)}
<CommandGroup className="flex flex-col overflow-x-hidden overflow-y-scroll max-h-52">
{isOpen && options.length > 0
? options.map((option) => (
<CommandItem
key={option.value}
onSelect={(value) => {
setInputValue("");
setIsOpen(false);
onValueChange(option.value);
}}
onMouseDown={(e) => {
e.preventDefault();
setIsOpen(false);
onValueChange(option.value);
}}
onClick={() => {
setIsOpen(false);
onValueChange(option.value);
}}
className="!z-50 !cursor-pointer flex justify-between min-w-[7rem] items-center !px-3 rounded-md truncate break-words w-full"
>
{option.label}
</CommandItem>
))
? options.map((option) => {
const Icon = option.icon;
return (
<CommandItem
key={option.value}
onSelect={(value) => {
setInputValue("");
setIsOpen(false);
onValueChange(option.value);
}}
onMouseDown={(e) => {
e.preventDefault();
setIsOpen(false);
onValueChange(option.value);
}}
onClick={() => {
setIsOpen(false);
onValueChange(option.value);
}}
className="!z-50 !cursor-pointer flex justify-between min-w-[7rem] items-center !px-3 rounded-md truncate break-words w-full"
>
{Icon ? (
<div className="flex items-center">
{Icon}
<span className="ml-1">{option.label}</span>
</div>
) : (
option.label
)}
</CommandItem>
);
})
: null}
</CommandGroup>
</Command>
Expand Down
11 changes: 10 additions & 1 deletion components/shared/AppSidebar/AppSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,16 @@ export const AppSideBar = ({ workspaceId, hideSidebar, sidebarCollapsed }: AppSi
<SingleSelect
isSearchable={!!user}
options={[
{ label: "Create new workspace...", value: "new" },
{
label: "Create new workspace...",
value: "new",
icon: (
<PlusIcon
style={{ strokeWidth: "3px" }}
className="w-5 text-gray-500 h-5 p-0.5 -ml-1 text-semibold group-hover:bg-orange-100 rounded-md"
/>
),
},
...workspaces.map(({ id, name }) => ({
label: name,
value: id,
Expand Down
Loading