Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -48,7 +46,6 @@ const WorkspaceSettingLayout = observer(function WorkspaceSettingLayout({ params
<div className="w-full h-full overflow-y-scroll md:pt-page-y">
<Outlet />
</div>
<WorkspaceSettingsRightSidebar workspaceSlug={workspaceSlug} />
</div>
)}
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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
Expand All @@ -53,7 +48,6 @@ const WorkspaceMembersSettingsPage = observer(function WorkspaceMembersSettingsP
const handleWorkspaceInvite = async (data: IWorkspaceBulkInviteFormData) => {
try {
await inviteMembersToWorkspace(workspaceSlug, data);
void mutateWorkspaceMembersActivity(workspaceSlug);

setInviteModal(false);

Expand Down Expand Up @@ -137,12 +131,7 @@ const WorkspaceMembersSettingsPage = observer(function WorkspaceMembersSettingsP
/>
<MembersActivityButton workspaceSlug={workspaceSlug} />
{canPerformWorkspaceAdminActions && (
<Button
variant="primary"
size="lg"
onClick={() => setInviteModal(true)}
data-ph-element={MEMBER_TRACKER_ELEMENTS.HEADER_ADD_BUTTON}
>
<Button variant="primary" size="lg" onClick={() => setInviteModal(true)}>
{t("workspace_settings.settings.members.add_member")}
</Button>
)}
Expand Down
1 change: 0 additions & 1 deletion apps/web/ce/components/workspace/right-sidebar/index.ts

This file was deleted.

10 changes: 0 additions & 10 deletions apps/web/ce/components/workspace/right-sidebar/root.tsx

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
Expand Down Expand Up @@ -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({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const WorkspaceMembersListItem = observer(function WorkspaceMembersListIt
workspace: { removeMemberFromWorkspace },
} = useMember();
const { leaveWorkspace } = useUserPermissions();
const { getWorkspaceRedirectionUrl, mutateWorkspaceMembersActivity } = useWorkspace();
const { getWorkspaceRedirectionUrl } = useWorkspace();
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

🧩 Analysis chain

🏁 Script executed:

# Search for any remaining references to mutateWorkspaceMembersActivity
echo "=== Searching for remaining references to mutateWorkspaceMembersActivity ==="
rg "mutateWorkspaceMembersActivity" -t ts -t tsx --no-heading

# Also search more broadly in case of partial matches
echo -e "\n=== Searching for workspace store/hook definitions ==="
fd -t f -e ts -e tsx | grep -E "(workspace|store)" | head -20

Repository: makeplane/plane

Length of output: 1206


🏁 Script executed:

# Search for useWorkspace hook definition more broadly
echo "=== Finding useWorkspace hook definition ==="
rg "const useWorkspace|function useWorkspace|export.*useWorkspace" -A 5 --type ts

# Also search for where workspace hooks/stores are defined
echo -e "\n=== Searching for workspace hook/store files ==="
fd -e ts -e tsx "workspace" | grep -E "(hook|store)" | head -20

Repository: makeplane/plane

Length of output: 7086


🏁 Script executed:

# Find IWorkspaceRootStore definition
echo "=== Searching for IWorkspaceRootStore definition ==="
rg "interface IWorkspaceRootStore|type IWorkspaceRootStore" -A 20 --type ts

# Also check the workspace store implementation
echo -e "\n=== Checking workspace store implementation ==="
cat "apps/web/core/store/workspace.store.ts" 2>/dev/null | head -100

Repository: makeplane/plane

Length of output: 2023


🏁 Script executed:

# Get the complete IWorkspaceRootStore interface definition
echo "=== Complete IWorkspaceRootStore interface ==="
rg "interface IWorkspaceRootStore" -A 100 --type ts | head -150

# Also check the actual file under review
echo -e "\n=== Checking members-list-item.tsx ==="
cat "apps/web/core/components/workspace/settings/members-list-item.tsx" 2>/dev/null | head -80

Repository: makeplane/plane

Length of output: 10788


🏁 Script executed:

# Get the complete IWorkspaceRootStore interface to confirm mutateWorkspaceMembersActivity is still there
echo "=== Full IWorkspaceRootStore interface definition ==="
sed -n '/^export interface IWorkspaceRootStore/,/^}/p' apps/web/core/store/workspace/index.ts

# Verify it's still implemented in the class
echo -e "\n=== Checking if mutateWorkspaceMembersActivity is still implemented ==="
rg "mutateWorkspaceMembersActivity" apps/web/core/store/workspace/index.ts -A 5

Repository: makeplane/plane

Length of output: 2416


Correct the destructuring to match actual usage.

The removal of mutateWorkspaceMembersActivity from this component's hook destructuring is appropriate—the method remains available in the workspace store but is no longer called here. The member removal and leave workflows function correctly without it.

🤖 Prompt for AI Agents
In apps/web/core/components/workspace/settings/members-list-item.tsx around line
35, the hook destructuring should only include values actually used in this
component; remove any leftover mutateWorkspaceMembersActivity from the
useWorkspace() destructure (leaving const { getWorkspaceRedirectionUrl } =
useWorkspace(); or equivalent), save the file and run the linter/TS build to
ensure no unused-variable warnings remain.

const { fetchCurrentUserSettings } = useUserSettings();
const { t } = useTranslation();
// derived values
Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down
Loading