π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
improvement: minor improvements for workspace switcher (#6609)
Prateek Shouryabf1f12378ea6
diff --git a/packages/types/src/workspace.d.ts b/packages/types/src/workspace.d.tsindex d72dad7cc6..3cec14baa4 100644--- a/packages/types/src/workspace.d.ts+++ b/packages/types/src/workspace.d.ts@@ -22,7 +22,6 @@ export interface IWorkspace {readonly updated_by: string;organization_size: string;total_projects?: number;- current_plan?: string;role: number;}diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.tsindex 510155f6a1..7ae2693187 100644--- a/packages/utils/src/index.ts+++ b/packages/utils/src/index.ts@@ -10,3 +10,4 @@ export * from "./issue";export * from "./state";export * from "./string";export * from "./theme";+export * from "./workspace";diff --git a/packages/utils/src/workspace.ts b/packages/utils/src/workspace.tsnew file mode 100644index 0000000000..1fb74e89c2--- /dev/null+++ b/packages/utils/src/workspace.ts@@ -0,0 +1,5 @@+// plane imports+import { IWorkspace } from "@plane/types";++export const orderWorkspacesList = (workspaces: IWorkspace[]): IWorkspace[] =>+ workspaces.sort((a, b) => a.name.localeCompare(b.name));diff --git a/web/ce/components/common/index.ts b/web/ce/components/common/index.tsnew file mode 100644index 0000000000..75c2cf410a--- /dev/null+++ b/web/ce/components/common/index.ts@@ -0,0 +1 @@+export * from "./subscription";diff --git a/web/ce/components/common/subscription/index.ts b/web/ce/components/common/subscription/index.tsnew file mode 100644index 0000000000..beb26e1d97--- /dev/null+++ b/web/ce/components/common/subscription/index.ts@@ -0,0 +1 @@+export * from "./subscription-pill";\ No newline at end of filediff --git a/web/ce/components/common/subscription-pill.tsx b/web/ce/components/common/subscription/subscription-pill.tsxsimilarity index 100%rename from web/ce/components/common/subscription-pill.tsxrename to web/ce/components/common/subscription/subscription-pill.tsxdiff --git a/web/core/components/workspace/sidebar/dropdown-item.tsx b/web/core/components/workspace/sidebar/dropdown-item.tsxindex 7638b65727..2259f95d20 100644--- a/web/core/components/workspace/sidebar/dropdown-item.tsx+++ b/web/core/components/workspace/sidebar/dropdown-item.tsx@@ -12,7 +12,7 @@ import { cn, getFileURL } from "@plane/utils";// helpersimport { getUserRole } from "@/helpers/user.helper";// plane web imports-import { SubscriptionPill } from "@/plane-web/components/common/subscription-pill";+import { SubscriptionPill } from "@/plane-web/components/common/subscription";type TProps = {workspace: IWorkspace;diff --git a/web/core/components/workspace/sidebar/dropdown.tsx b/web/core/components/workspace/sidebar/dropdown.tsxindex ac9acf42e5..0719d95c0a 100644--- a/web/core/components/workspace/sidebar/dropdown.tsx+++ b/web/core/components/workspace/sidebar/dropdown.tsx@@ -8,13 +8,13 @@ import { usePopper } from "react-popper";import { ChevronDown, CirclePlus, LogOut, Mails, Settings } from "lucide-react";// uiimport { Menu, Transition } from "@headlessui/react";-// types+// plane importsimport { useTranslation } from "@plane/i18n";import { IWorkspace } from "@plane/types";-// plane uiimport { Avatar, Loader, TOAST_TYPE, setToast } from "@plane/ui";-import { GOD_MODE_URL, cn } from "@/helpers/common.helper";+import { orderWorkspacesList } from "@plane/utils";// helpers+import { GOD_MODE_URL, cn } from "@/helpers/common.helper";import { getFileURL } from "@/helpers/file.helper";// hooksimport { useAppTheme, useUser, useUserProfile, useWorkspace } from "@/hooks/store";@@ -66,7 +66,7 @@ export const SidebarDropdown = observer(() => {toggleSidebar();}};- const workspacesList = Object.values(workspaces ?? {});+ const workspacesList = orderWorkspacesList(Object.values(workspaces ?? {}));// TODO: fix workspaces list scrollreturn (<div className="flex items-center justify-center gap-x-3 gap-y-2">diff --git a/web/ee/components/common/subscription-pill.tsx b/web/ee/components/common/subscription-pill.tsxdeleted file mode 100644index 38bcdebd5a..0000000000--- a/web/ee/components/common/subscription-pill.tsx+++ /dev/null@@ -1 +0,0 @@-export * from "ce/components/common/subscription-pill";