improvement: minor improvements for workspace switcher (#6609)

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;
 }
 

packages/utils/src/index.ts

@@ -10,3 +10,4 @@ export * from "./issue";
 export * from "./state";
 export * from "./string";
 export * from "./theme";
+export * from "./workspace";

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));

web/ce/components/common/index.ts

@@ -0,0 +1 @@
+export * from "./subscription";

web/ce/components/common/subscription/index.ts

@@ -0,0 +1 @@
+export * from "./subscription-pill";

web/core/components/workspace/sidebar/dropdown-item.tsx

@@ -12,7 +12,7 @@ import { cn, getFileURL } from "@plane/utils";
 // helpers
 import { 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;

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";
 // ui
 import { Menu, Transition } from "@headlessui/react";
-// types
+// plane imports
 import { useTranslation } from "@plane/i18n";
 import { IWorkspace } from "@plane/types";
-// plane ui
 import { 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";
 // hooks
 import { 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 scroll
   return (
     <div className="flex items-center justify-center gap-x-3 gap-y-2">

web/ee/components/common/subscription-pill.tsx

@@ -1 +0,0 @@
-export * from "ce/components/common/subscription-pill";