This reverts commit c97e418515.
This commit is contained in:
parent
d61b157929
commit
6129e8e53b
15 changed files with 51 additions and 85 deletions
|
|
@ -9,7 +9,7 @@ import { SettingsMobileNav } from "@/components/settings/mobile";
|
|||
import { WORKSPACE_SETTINGS_ACCESS } from "@plane/constants";
|
||||
import type { EUserWorkspaceRoles } from "@plane/types";
|
||||
// plane web components
|
||||
import { SettingsRightSidebar } from "@/plane-web/components/settings/right-sidebar";
|
||||
import { WorkspaceSettingsRightSidebar } from "@/plane-web/components/workspace/right-sidebar";
|
||||
// hooks
|
||||
import { useUserPermissions } from "@/hooks/store/user";
|
||||
// local components
|
||||
|
|
@ -48,7 +48,7 @@ const WorkspaceSettingLayout = observer(function WorkspaceSettingLayout({ params
|
|||
<div className="w-full h-full overflow-y-scroll md:pt-page-y">
|
||||
<Outlet />
|
||||
</div>
|
||||
<SettingsRightSidebar workspaceSlug={workspaceSlug} />
|
||||
<WorkspaceSettingsRightSidebar workspaceSlug={workspaceSlug} />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ const WorkspaceMembersSettingsPage = observer(function WorkspaceMembersSettingsP
|
|||
const {
|
||||
workspace: { workspaceMemberIds, inviteMembersToWorkspace, filtersStore },
|
||||
} = useMember();
|
||||
const { currentWorkspace } = useWorkspace();
|
||||
const { currentWorkspace, mutateWorkspaceMembersActivity } = useWorkspace();
|
||||
const { t } = useTranslation();
|
||||
|
||||
// derived values
|
||||
|
|
@ -53,6 +53,7 @@ const WorkspaceMembersSettingsPage = observer(function WorkspaceMembersSettingsP
|
|||
const handleWorkspaceInvite = async (data: IWorkspaceBulkInviteFormData) => {
|
||||
try {
|
||||
await inviteMembersToWorkspace(workspaceSlug, data);
|
||||
void mutateWorkspaceMembersActivity(workspaceSlug);
|
||||
|
||||
setInviteModal(false);
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,10 @@ import { SettingsMobileNav } from "@/components/settings/mobile";
|
|||
import { ProjectSettingsSidebar } from "@/components/settings/project/sidebar";
|
||||
// plane web imports
|
||||
import { ProjectAuthWrapper } from "@/plane-web/layouts/project-wrapper";
|
||||
import { SettingsRightSidebar } from "@/plane-web/components/settings/right-sidebar";
|
||||
// types
|
||||
import type { Route } from "./+types/layout";
|
||||
|
||||
export const ProjectDetailSettingsLayout = observer(function ProjectDetailSettingsLayout({
|
||||
params,
|
||||
}: Route.ComponentProps) {
|
||||
function ProjectDetailSettingsLayout({ params }: Route.ComponentProps) {
|
||||
const { workspaceSlug, projectId } = params;
|
||||
// router
|
||||
const pathname = usePathname();
|
||||
|
|
@ -27,11 +24,10 @@ export const ProjectDetailSettingsLayout = observer(function ProjectDetailSettin
|
|||
<div className="w-full h-full overflow-y-scroll md:pt-page-y">
|
||||
<Outlet />
|
||||
</div>
|
||||
<SettingsRightSidebar workspaceSlug={workspaceSlug} projectId={projectId} />
|
||||
</ProjectAuthWrapper>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
export default ProjectDetailSettingsLayout;
|
||||
export default observer(ProjectDetailSettingsLayout);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue