From 83878ad7982956c3449a25e7cf3eaec1c32dbffb Mon Sep 17 00:00:00 2001 From: Prateek Shourya Date: Tue, 30 Dec 2025 21:55:28 +0530 Subject: [PATCH] chore: remove unused right sidebar component and clean up workspace member settings --- .../(settings)/settings/(workspace)/layout.tsx | 3 --- .../settings/(workspace)/members/page.tsx | 17 +++-------------- .../components/workspace/right-sidebar/index.ts | 1 - .../components/workspace/right-sidebar/root.tsx | 10 ---------- .../settings/invitations-list-item.tsx | 3 --- .../workspace/settings/member-columns.tsx | 4 ---- .../workspace/settings/members-list-item.tsx | 3 +-- .../member/workspace/workspace-member.store.ts | 4 ++-- 8 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 apps/web/ce/components/workspace/right-sidebar/index.ts delete mode 100644 apps/web/ce/components/workspace/right-sidebar/root.tsx diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/layout.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/layout.tsx index 783f7a0dd06..9eb72a7829b 100644 --- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/layout.tsx +++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/layout.tsx @@ -8,8 +8,6 @@ import { SettingsMobileNav } from "@/components/settings/mobile"; // plane imports import { WORKSPACE_SETTINGS_ACCESS } from "@plane/constants"; import type { EUserWorkspaceRoles } from "@plane/types"; -// plane web components -import { WorkspaceSettingsRightSidebar } from "@/plane-web/components/workspace/right-sidebar"; // hooks import { useUserPermissions } from "@/hooks/store/user"; // local components @@ -48,7 +46,6 @@ const WorkspaceSettingLayout = observer(function WorkspaceSettingLayout({ params
- )} diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/members/page.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/members/page.tsx index d096a17fffb..7f8e32fec19 100644 --- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/members/page.tsx +++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/members/page.tsx @@ -1,12 +1,7 @@ import { useState } from "react"; import { observer } from "mobx-react"; // types -import { - EUserPermissions, - EUserPermissionsLevel, - MEMBER_TRACKER_ELEMENTS, - MEMBER_TRACKER_EVENTS, -} from "@plane/constants"; +import { EUserPermissions, EUserPermissionsLevel } from "@plane/constants"; import { useTranslation } from "@plane/i18n"; import { Button } from "@plane/propel/button"; import { SearchIcon } from "@plane/propel/icons"; @@ -40,7 +35,7 @@ const WorkspaceMembersSettingsPage = observer(function WorkspaceMembersSettingsP const { workspace: { workspaceMemberIds, inviteMembersToWorkspace, filtersStore }, } = useMember(); - const { currentWorkspace, mutateWorkspaceMembersActivity } = useWorkspace(); + const { currentWorkspace } = useWorkspace(); const { t } = useTranslation(); // derived values @@ -53,7 +48,6 @@ const WorkspaceMembersSettingsPage = observer(function WorkspaceMembersSettingsP const handleWorkspaceInvite = async (data: IWorkspaceBulkInviteFormData) => { try { await inviteMembersToWorkspace(workspaceSlug, data); - void mutateWorkspaceMembersActivity(workspaceSlug); setInviteModal(false); @@ -137,12 +131,7 @@ const WorkspaceMembersSettingsPage = observer(function WorkspaceMembersSettingsP /> {canPerformWorkspaceAdminActions && ( - )} diff --git a/apps/web/ce/components/workspace/right-sidebar/index.ts b/apps/web/ce/components/workspace/right-sidebar/index.ts deleted file mode 100644 index 1efe34c51ec..00000000000 --- a/apps/web/ce/components/workspace/right-sidebar/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./root"; diff --git a/apps/web/ce/components/workspace/right-sidebar/root.tsx b/apps/web/ce/components/workspace/right-sidebar/root.tsx deleted file mode 100644 index c98bb682a52..00000000000 --- a/apps/web/ce/components/workspace/right-sidebar/root.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import { observer } from "mobx-react"; - -type TWorkspaceSettingsRightSidebarProps = { workspaceSlug: string }; - -export const WorkspaceSettingsRightSidebar = observer(function WorkspaceSettingsRightSidebar( - // eslint-disable-next-line @typescript-eslint/no-unused-vars - props: TWorkspaceSettingsRightSidebarProps -) { - return <>; -}); diff --git a/apps/web/core/components/workspace/settings/invitations-list-item.tsx b/apps/web/core/components/workspace/settings/invitations-list-item.tsx index 20ea3d7a9cc..12b4cc821f3 100644 --- a/apps/web/core/components/workspace/settings/invitations-list-item.tsx +++ b/apps/web/core/components/workspace/settings/invitations-list-item.tsx @@ -14,7 +14,6 @@ import { ConfirmWorkspaceMemberRemove } from "@/components/workspace/confirm-wor // hooks import { useMember } from "@/hooks/store/use-member"; import { useUserPermissions } from "@/hooks/store/user"; -import { useWorkspace } from "@/hooks/store/use-workspace"; type Props = { invitationId: string; @@ -30,7 +29,6 @@ export const WorkspaceInvitationsListItem = observer(function WorkspaceInvitatio const { t } = useTranslation(); // store hooks const { allowPermissions, workspaceInfoBySlug } = useUserPermissions(); - const { mutateWorkspaceMembersActivity } = useWorkspace(); const { workspace: { updateMemberInvitation, deleteMemberInvitation, getWorkspaceInvitationDetails }, } = useMember(); @@ -59,7 +57,6 @@ export const WorkspaceInvitationsListItem = observer(function WorkspaceInvitatio title: "Success!", message: "Invitation removed successfully.", }); - void mutateWorkspaceMembersActivity(workspaceSlug); } catch (err: unknown) { const error = err as { error?: string }; setToast({ diff --git a/apps/web/core/components/workspace/settings/member-columns.tsx b/apps/web/core/components/workspace/settings/member-columns.tsx index b98438b1d44..4167a79397a 100644 --- a/apps/web/core/components/workspace/settings/member-columns.tsx +++ b/apps/web/core/components/workspace/settings/member-columns.tsx @@ -16,8 +16,6 @@ import { getFileURL } from "@plane/utils"; // hooks import { useMember } from "@/hooks/store/use-member"; import { useUser, useUserPermissions } from "@/hooks/store/user"; -import { useWorkspace } from "@/hooks/store/use-workspace"; -// plane web constants export interface RowData { member: IWorkspaceMember; @@ -121,7 +119,6 @@ export const AccountTypeColumn = observer(function AccountTypeColumn(props: Acco const { workspace: { updateMember }, } = useMember(); - const { mutateWorkspaceMembersActivity } = useWorkspace(); const { data: currentUser } = useUser(); // derived values @@ -156,7 +153,6 @@ export const AccountTypeColumn = observer(function AccountTypeColumn(props: Acco await updateMember(workspaceSlug.toString(), rowData.member.id, { role: value as unknown as EUserPermissions, }); - void mutateWorkspaceMembersActivity(workspaceSlug); } catch (err: unknown) { const error = err as { error?: string | string[] }; const errorString = Array.isArray(error?.error) ? error.error[0] : error?.error; diff --git a/apps/web/core/components/workspace/settings/members-list-item.tsx b/apps/web/core/components/workspace/settings/members-list-item.tsx index 4f0b20dc5df..9499110ee55 100644 --- a/apps/web/core/components/workspace/settings/members-list-item.tsx +++ b/apps/web/core/components/workspace/settings/members-list-item.tsx @@ -32,7 +32,7 @@ export const WorkspaceMembersListItem = observer(function WorkspaceMembersListIt workspace: { removeMemberFromWorkspace }, } = useMember(); const { leaveWorkspace } = useUserPermissions(); - const { getWorkspaceRedirectionUrl, mutateWorkspaceMembersActivity } = useWorkspace(); + const { getWorkspaceRedirectionUrl } = useWorkspace(); const { fetchCurrentUserSettings } = useUserSettings(); const { t } = useTranslation(); // derived values @@ -59,7 +59,6 @@ export const WorkspaceMembersListItem = observer(function WorkspaceMembersListIt try { await removeMemberFromWorkspace(workspaceSlug.toString(), memberId); - void mutateWorkspaceMembersActivity(workspaceSlug); } catch (err: unknown) { const error = err as { error?: string }; setToast({ diff --git a/apps/web/core/store/member/workspace/workspace-member.store.ts b/apps/web/core/store/member/workspace/workspace-member.store.ts index edf9d2a2972..ad0df64fcf6 100644 --- a/apps/web/core/store/member/workspace/workspace-member.store.ts +++ b/apps/web/core/store/member/workspace/workspace-member.store.ts @@ -11,10 +11,10 @@ import { WorkspaceService } from "@/plane-web/services"; import type { IRouterStore } from "@/store/router.store"; import type { IUserStore } from "@/store/user"; // store -import type { CoreRootStore } from "../../root.store"; import type { IMemberRootStore } from "../index.ts"; import type { IWorkspaceMemberFiltersStore } from "./workspace-member-filters.store"; import { WorkspaceMemberFiltersStore } from "./workspace-member-filters.store"; +import type { RootStore } from "@/plane-web/store/root.store"; export interface IWorkspaceMembership { id: string; @@ -72,7 +72,7 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore { // services workspaceService; - constructor(_memberRoot: IMemberRootStore, _rootStore: CoreRootStore) { + constructor(_memberRoot: IMemberRootStore, _rootStore: RootStore) { makeObservable(this, { // observables workspaceMemberMap: observable,