chore: remove unused right sidebar component and clean up workspace member settings (#8477)
This commit is contained in:
parent
6129e8e53b
commit
3d5e427894
8 changed files with 6 additions and 39 deletions
|
|
@ -8,8 +8,6 @@ import { SettingsMobileNav } from "@/components/settings/mobile";
|
||||||
// plane imports
|
// plane imports
|
||||||
import { WORKSPACE_SETTINGS_ACCESS } from "@plane/constants";
|
import { WORKSPACE_SETTINGS_ACCESS } from "@plane/constants";
|
||||||
import type { EUserWorkspaceRoles } from "@plane/types";
|
import type { EUserWorkspaceRoles } from "@plane/types";
|
||||||
// plane web components
|
|
||||||
import { WorkspaceSettingsRightSidebar } from "@/plane-web/components/workspace/right-sidebar";
|
|
||||||
// hooks
|
// hooks
|
||||||
import { useUserPermissions } from "@/hooks/store/user";
|
import { useUserPermissions } from "@/hooks/store/user";
|
||||||
// local components
|
// local components
|
||||||
|
|
@ -48,7 +46,6 @@ const WorkspaceSettingLayout = observer(function WorkspaceSettingLayout({ params
|
||||||
<div className="w-full h-full overflow-y-scroll md:pt-page-y">
|
<div className="w-full h-full overflow-y-scroll md:pt-page-y">
|
||||||
<Outlet />
|
<Outlet />
|
||||||
</div>
|
</div>
|
||||||
<WorkspaceSettingsRightSidebar workspaceSlug={workspaceSlug} />
|
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,7 @@
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { observer } from "mobx-react";
|
import { observer } from "mobx-react";
|
||||||
// types
|
// types
|
||||||
import {
|
import { EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
|
||||||
EUserPermissions,
|
|
||||||
EUserPermissionsLevel,
|
|
||||||
MEMBER_TRACKER_ELEMENTS,
|
|
||||||
MEMBER_TRACKER_EVENTS,
|
|
||||||
} from "@plane/constants";
|
|
||||||
import { useTranslation } from "@plane/i18n";
|
import { useTranslation } from "@plane/i18n";
|
||||||
import { Button } from "@plane/propel/button";
|
import { Button } from "@plane/propel/button";
|
||||||
import { SearchIcon } from "@plane/propel/icons";
|
import { SearchIcon } from "@plane/propel/icons";
|
||||||
|
|
@ -40,7 +35,7 @@ const WorkspaceMembersSettingsPage = observer(function WorkspaceMembersSettingsP
|
||||||
const {
|
const {
|
||||||
workspace: { workspaceMemberIds, inviteMembersToWorkspace, filtersStore },
|
workspace: { workspaceMemberIds, inviteMembersToWorkspace, filtersStore },
|
||||||
} = useMember();
|
} = useMember();
|
||||||
const { currentWorkspace, mutateWorkspaceMembersActivity } = useWorkspace();
|
const { currentWorkspace } = useWorkspace();
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
|
||||||
// derived values
|
// derived values
|
||||||
|
|
@ -53,7 +48,6 @@ const WorkspaceMembersSettingsPage = observer(function WorkspaceMembersSettingsP
|
||||||
const handleWorkspaceInvite = async (data: IWorkspaceBulkInviteFormData) => {
|
const handleWorkspaceInvite = async (data: IWorkspaceBulkInviteFormData) => {
|
||||||
try {
|
try {
|
||||||
await inviteMembersToWorkspace(workspaceSlug, data);
|
await inviteMembersToWorkspace(workspaceSlug, data);
|
||||||
void mutateWorkspaceMembersActivity(workspaceSlug);
|
|
||||||
|
|
||||||
setInviteModal(false);
|
setInviteModal(false);
|
||||||
|
|
||||||
|
|
@ -137,12 +131,7 @@ const WorkspaceMembersSettingsPage = observer(function WorkspaceMembersSettingsP
|
||||||
/>
|
/>
|
||||||
<MembersActivityButton workspaceSlug={workspaceSlug} />
|
<MembersActivityButton workspaceSlug={workspaceSlug} />
|
||||||
{canPerformWorkspaceAdminActions && (
|
{canPerformWorkspaceAdminActions && (
|
||||||
<Button
|
<Button variant="primary" size="lg" onClick={() => setInviteModal(true)}>
|
||||||
variant="primary"
|
|
||||||
size="lg"
|
|
||||||
onClick={() => setInviteModal(true)}
|
|
||||||
data-ph-element={MEMBER_TRACKER_ELEMENTS.HEADER_ADD_BUTTON}
|
|
||||||
>
|
|
||||||
{t("workspace_settings.settings.members.add_member")}
|
{t("workspace_settings.settings.members.add_member")}
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
export * from "./root";
|
|
||||||
|
|
@ -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 <></>;
|
|
||||||
});
|
|
||||||
|
|
@ -14,7 +14,6 @@ import { ConfirmWorkspaceMemberRemove } from "@/components/workspace/confirm-wor
|
||||||
// hooks
|
// hooks
|
||||||
import { useMember } from "@/hooks/store/use-member";
|
import { useMember } from "@/hooks/store/use-member";
|
||||||
import { useUserPermissions } from "@/hooks/store/user";
|
import { useUserPermissions } from "@/hooks/store/user";
|
||||||
import { useWorkspace } from "@/hooks/store/use-workspace";
|
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
invitationId: string;
|
invitationId: string;
|
||||||
|
|
@ -30,7 +29,6 @@ export const WorkspaceInvitationsListItem = observer(function WorkspaceInvitatio
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
// store hooks
|
// store hooks
|
||||||
const { allowPermissions, workspaceInfoBySlug } = useUserPermissions();
|
const { allowPermissions, workspaceInfoBySlug } = useUserPermissions();
|
||||||
const { mutateWorkspaceMembersActivity } = useWorkspace();
|
|
||||||
const {
|
const {
|
||||||
workspace: { updateMemberInvitation, deleteMemberInvitation, getWorkspaceInvitationDetails },
|
workspace: { updateMemberInvitation, deleteMemberInvitation, getWorkspaceInvitationDetails },
|
||||||
} = useMember();
|
} = useMember();
|
||||||
|
|
@ -59,7 +57,6 @@ export const WorkspaceInvitationsListItem = observer(function WorkspaceInvitatio
|
||||||
title: "Success!",
|
title: "Success!",
|
||||||
message: "Invitation removed successfully.",
|
message: "Invitation removed successfully.",
|
||||||
});
|
});
|
||||||
void mutateWorkspaceMembersActivity(workspaceSlug);
|
|
||||||
} catch (err: unknown) {
|
} catch (err: unknown) {
|
||||||
const error = err as { error?: string };
|
const error = err as { error?: string };
|
||||||
setToast({
|
setToast({
|
||||||
|
|
|
||||||
|
|
@ -16,8 +16,6 @@ import { getFileURL } from "@plane/utils";
|
||||||
// hooks
|
// hooks
|
||||||
import { useMember } from "@/hooks/store/use-member";
|
import { useMember } from "@/hooks/store/use-member";
|
||||||
import { useUser, useUserPermissions } from "@/hooks/store/user";
|
import { useUser, useUserPermissions } from "@/hooks/store/user";
|
||||||
import { useWorkspace } from "@/hooks/store/use-workspace";
|
|
||||||
// plane web constants
|
|
||||||
|
|
||||||
export interface RowData {
|
export interface RowData {
|
||||||
member: IWorkspaceMember;
|
member: IWorkspaceMember;
|
||||||
|
|
@ -121,7 +119,6 @@ export const AccountTypeColumn = observer(function AccountTypeColumn(props: Acco
|
||||||
const {
|
const {
|
||||||
workspace: { updateMember },
|
workspace: { updateMember },
|
||||||
} = useMember();
|
} = useMember();
|
||||||
const { mutateWorkspaceMembersActivity } = useWorkspace();
|
|
||||||
const { data: currentUser } = useUser();
|
const { data: currentUser } = useUser();
|
||||||
|
|
||||||
// derived values
|
// derived values
|
||||||
|
|
@ -156,7 +153,6 @@ export const AccountTypeColumn = observer(function AccountTypeColumn(props: Acco
|
||||||
await updateMember(workspaceSlug.toString(), rowData.member.id, {
|
await updateMember(workspaceSlug.toString(), rowData.member.id, {
|
||||||
role: value as unknown as EUserPermissions,
|
role: value as unknown as EUserPermissions,
|
||||||
});
|
});
|
||||||
void mutateWorkspaceMembersActivity(workspaceSlug);
|
|
||||||
} catch (err: unknown) {
|
} catch (err: unknown) {
|
||||||
const error = err as { error?: string | string[] };
|
const error = err as { error?: string | string[] };
|
||||||
const errorString = Array.isArray(error?.error) ? error.error[0] : error?.error;
|
const errorString = Array.isArray(error?.error) ? error.error[0] : error?.error;
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ export const WorkspaceMembersListItem = observer(function WorkspaceMembersListIt
|
||||||
workspace: { removeMemberFromWorkspace },
|
workspace: { removeMemberFromWorkspace },
|
||||||
} = useMember();
|
} = useMember();
|
||||||
const { leaveWorkspace } = useUserPermissions();
|
const { leaveWorkspace } = useUserPermissions();
|
||||||
const { getWorkspaceRedirectionUrl, mutateWorkspaceMembersActivity } = useWorkspace();
|
const { getWorkspaceRedirectionUrl } = useWorkspace();
|
||||||
const { fetchCurrentUserSettings } = useUserSettings();
|
const { fetchCurrentUserSettings } = useUserSettings();
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
// derived values
|
// derived values
|
||||||
|
|
@ -59,7 +59,6 @@ export const WorkspaceMembersListItem = observer(function WorkspaceMembersListIt
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await removeMemberFromWorkspace(workspaceSlug.toString(), memberId);
|
await removeMemberFromWorkspace(workspaceSlug.toString(), memberId);
|
||||||
void mutateWorkspaceMembersActivity(workspaceSlug);
|
|
||||||
} catch (err: unknown) {
|
} catch (err: unknown) {
|
||||||
const error = err as { error?: string };
|
const error = err as { error?: string };
|
||||||
setToast({
|
setToast({
|
||||||
|
|
|
||||||
|
|
@ -11,10 +11,10 @@ import { WorkspaceService } from "@/plane-web/services";
|
||||||
import type { IRouterStore } from "@/store/router.store";
|
import type { IRouterStore } from "@/store/router.store";
|
||||||
import type { IUserStore } from "@/store/user";
|
import type { IUserStore } from "@/store/user";
|
||||||
// store
|
// store
|
||||||
import type { CoreRootStore } from "../../root.store";
|
|
||||||
import type { IMemberRootStore } from "../index.ts";
|
import type { IMemberRootStore } from "../index.ts";
|
||||||
import type { IWorkspaceMemberFiltersStore } from "./workspace-member-filters.store";
|
import type { IWorkspaceMemberFiltersStore } from "./workspace-member-filters.store";
|
||||||
import { WorkspaceMemberFiltersStore } from "./workspace-member-filters.store";
|
import { WorkspaceMemberFiltersStore } from "./workspace-member-filters.store";
|
||||||
|
import type { RootStore } from "@/plane-web/store/root.store";
|
||||||
|
|
||||||
export interface IWorkspaceMembership {
|
export interface IWorkspaceMembership {
|
||||||
id: string;
|
id: string;
|
||||||
|
|
@ -72,7 +72,7 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {
|
||||||
// services
|
// services
|
||||||
workspaceService;
|
workspaceService;
|
||||||
|
|
||||||
constructor(_memberRoot: IMemberRootStore, _rootStore: CoreRootStore) {
|
constructor(_memberRoot: IMemberRootStore, _rootStore: RootStore) {
|
||||||
makeObservable(this, {
|
makeObservable(this, {
|
||||||
// observables
|
// observables
|
||||||
workspaceMemberMap: observable,
|
workspaceMemberMap: observable,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue