-
{invitations ? (
- invitations.length > 0 ? (
-
-
-
+ {currentUser?.email}
-
-
-
-
{t("we_see_that_someone_has_invited_you_to_join_a_workspace")}
-{t("join_a_workspace")}
+ hasInvitations ? ( +
+
+
- {!projectMemberIds ? (
+ {!hasFetchedProjectMembers ? (
+
-
+
+
+
+
+
+
+ Принять доступ
++ Выберите рабочие пространства, к которым хотите присоединиться. После принятия Tasker + откроет первый выбранный workspace. +
+
+
+
+
+
{invitations.map((invitation) => {
const isSelected = invitationsRespond.includes(invitation.id);
return (
-
-
-
+ router.push("/")} />}
+ />
) : (
-
- {!currentUser ? (
-
+ router.push("/")} />}
+ />
)
) : (
-
);
}
export default observer(WorkspaceInvitationPage);
+
+function InvitationShell({
+ action,
+ description,
+ eyebrow = "NODE.DC Tasker",
+ title,
+}: {
+ action: ReactNode;
+ description: string;
+ eyebrow?: string;
+ title: string;
+}) {
+ return (
+
@@ -113,7 +126,7 @@ export const ProjectMemberList = observer(function ProjectMemberList(props: TPro
)}
handleInvitation(invitation, isSelected ? "withdraw" : "accepted")}
>
-
-
+
+
);
})}
-
-
+
{truncateText(invitation.workspace.name, 30)}
- +
{truncateText(invitation.workspace.name, 42)}
+ {t(ROLE_DETAILS[invitation.role as keyof typeof ROLE_DETAILS]?.i18n_title || "")}
+
) : (
-
-
@@ -179,20 +206,32 @@ function UserInvitationsPage() {
- router.push("/"),
- }}
- />
+
+
);
}
diff --git a/plane-src/apps/web/app/(all)/workspace-invitations/layout.tsx b/plane-src/apps/web/app/(all)/workspace-invitations/layout.tsx
index b9a7337..145979d 100644
--- a/plane-src/apps/web/app/(all)/workspace-invitations/layout.tsx
+++ b/plane-src/apps/web/app/(all)/workspace-invitations/layout.tsx
@@ -11,4 +11,4 @@ export default function WorkspaceInvitationsLayout() {
return
+
)
) : null}
-
+
+
+
+
+
+
+ Нет ожидающих приглашений
++ Когда вас пригласят в workspace, здесь появится карточка доступа с возможностью принять приглашение. +
+
+
{invitationDetail && !invitationDetail.responded_at ? (
error ? (
- router.push("/")} />}
+ />
) : (
-
-
+
+ }
+ >
+ Принять
+
+ }
+ >
+ Отклонить
+
+
+ }
+ />
)
) : error || invitationDetail?.responded_at ? (
invitationDetail?.accepted ? (
-
-
+ INVITATION NOT FOUND
-
+
+
+
+
+ );
+}
+
+function HomeButton({ routerPush }: { routerPush: () => void }) {
+ return (
+ }
+ >
+ Вернуться на главную
+
+ );
+}
diff --git a/plane-src/apps/web/core/components/nodedc/standalone-shell.tsx b/plane-src/apps/web/core/components/nodedc/standalone-shell.tsx
new file mode 100644
index 0000000..785b83b
--- /dev/null
+++ b/plane-src/apps/web/core/components/nodedc/standalone-shell.tsx
@@ -0,0 +1,96 @@
+"use client";
+
+/**
+ * Copyright (c) 2023-present Plane Software, Inc. and contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ * See the LICENSE file for details.
+ */
+
+import type { ReactNode } from "react";
+import { useEffect, useState } from "react";
+import { useTranslation } from "@plane/i18n";
+import { InboxIcon } from "@plane/propel/icons";
+import { Tooltip } from "@plane/propel/tooltip";
+import { buildNodeDCBrandConfigUrl, buildNodeDCLauncherUrl } from "@/helpers/nodedc-auth";
+import { UserMenuRoot } from "@/components/workspace/sidebar/user-menu-root";
+
+type TNodeDCStandaloneShellProps = {
+ children: ReactNode;
+ notificationsCount?: number;
+ onOpenNotifications?: () => void;
+ showUserControls?: boolean;
+};
+
+export const NodeDCStandaloneShell = (props: TNodeDCStandaloneShellProps) => {
+ const { children, notificationsCount = 0, onOpenNotifications, showUserControls = false } = props;
+ const { t } = useTranslation();
+ const [logoLinkUrl, setLogoLinkUrl] = useState(buildNodeDCLauncherUrl);
+
+ useEffect(() => {
+ let isMounted = true;
+
+ fetch(buildNodeDCBrandConfigUrl(), { cache: "no-store" })
+ .then((response) => (response.ok ? response.json() : null))
+ .then((payload: { logoLinkUrl?: string } | null) => {
+ if (isMounted && payload?.logoLinkUrl) setLogoLinkUrl(payload.logoLinkUrl);
+ return undefined;
+ })
+ .catch((error: unknown) => {
+ console.warn(error instanceof Error ? error.message : "Не удалось загрузить brand config NODE.DC");
+ });
+
+ return () => {
+ isMounted = false;
+ };
+ }, []);
+
+ return (
+
+
+
+
+
+ {eyebrow}
+
+ {title}
+{description}
+{action}
+
+
+
+
+
+ {children}
+
+
+ );
+};
diff --git a/plane-src/apps/web/core/components/project/member-list.tsx b/plane-src/apps/web/core/components/project/member-list.tsx
index 61ad139..1295647 100644
--- a/plane-src/apps/web/core/components/project/member-list.tsx
+++ b/plane-src/apps/web/core/components/project/member-list.tsx
@@ -4,7 +4,7 @@
* See the LICENSE file for details.
*/
-import { useState } from "react";
+import { useEffect, useState } from "react";
import { observer } from "mobx-react";
// plane imports
import { EUserPermissions, EUserPermissionsLevel, MEMBER_TRACKER_ELEMENTS } from "@plane/constants";
@@ -32,11 +32,25 @@ export const ProjectMemberList = observer(function ProjectMemberList(props: TPro
const [inviteModal, setInviteModal] = useState(false);
const [searchQuery, setSearchQuery] = useState("");
const {
- project: { projectMemberIds, getFilteredProjectMemberDetails, filters },
+ project: {
+ fetchProjectMembers,
+ getFilteredProjectMemberDetails,
+ getProjectMemberFetchStatus,
+ getProjectMemberIds,
+ filters,
+ },
} = useMember();
const { allowPermissions } = useUserPermissions();
const { t } = useTranslation();
+ const hasFetchedProjectMembers = getProjectMemberFetchStatus(projectId.toString());
+ const projectMemberIds = getProjectMemberIds(projectId.toString(), true);
+
+ useEffect(() => {
+ if (!workspaceSlug || !projectId) return;
+
+ void fetchProjectMembers(workspaceSlug.toString(), projectId.toString(), true).catch(console.error);
+ }, [fetchProjectMembers, projectId, workspaceSlug]);
const searchedProjectMembers = (projectMemberIds ?? []).filter((userId) => {
const memberDetails = projectId ? getFilteredProjectMemberDetails(userId, projectId.toString()) : null;
@@ -53,7 +67,7 @@ export const ProjectMemberList = observer(function ProjectMemberList(props: TPro
projectId ? getFilteredProjectMemberDetails(memberId, projectId.toString()) : null
);
- const isAdmin = allowPermissions([EUserPermissions.ADMIN], EUserPermissionsLevel.PROJECT);
+ const isAdmin = allowPermissions([EUserPermissions.ADMIN], EUserPermissionsLevel.PROJECT, workspaceSlug, projectId);
// Handler for role filter updates
const handleRoleFilterUpdate = (role: string) => {
@@ -90,7 +104,6 @@ export const ProjectMemberList = observer(function ProjectMemberList(props: TPro
className="w-full max-w-[234px] border-none bg-transparent text-13 placeholder:text-placeholder focus:outline-none"
placeholder={t("search")}
value={searchQuery}
- autoFocus
onChange={(e) => setSearchQuery(e.target.value)}
/>
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+ {showUserControls && (
+
+
+ {onOpenNotifications && (
+
+
+
+ )}
+
+ )}
+
diff --git a/plane-src/apps/web/core/components/project/member-select.tsx b/plane-src/apps/web/core/components/project/member-select.tsx
index c299d3a..583fb91 100644
--- a/plane-src/apps/web/core/components/project/member-select.tsx
+++ b/plane-src/apps/web/core/components/project/member-select.tsx
@@ -21,21 +21,25 @@ type Props = {
value: any;
onChange: (val: string) => void;
isDisabled?: boolean;
+ projectId?: string;
};
export const MemberSelect = observer(function MemberSelect(props: Props) {
- const { value, onChange, isDisabled = false } = props;
+ const { value, onChange, isDisabled = false, projectId: explicitProjectId } = props;
const { t } = useTranslation();
// router
- const { projectId } = useParams();
+ const { projectId: routeProjectId } = useParams();
+ const projectId = explicitProjectId ?? routeProjectId?.toString();
// store hooks
const {
- project: { projectMemberIds, getProjectMemberDetails },
+ project: { getProjectMemberDetails, getProjectMemberIds },
} = useMember();
+ const projectMemberIds = projectId ? getProjectMemberIds(projectId, true) : null;
+
const options = projectMemberIds
?.map((userId) => {
- const memberDetails = projectId ? getProjectMemberDetails(userId, projectId.toString()) : null;
+ const memberDetails = projectId ? getProjectMemberDetails(userId, projectId) : null;
if (!memberDetails?.member) return;
const isGuest = memberDetails.role === EUserProjectRoles.GUEST;
@@ -59,7 +63,7 @@ export const MemberSelect = observer(function MemberSelect(props: Props) {
content: React.ReactNode;
}[]
| undefined;
- const selectedOption = projectId ? getProjectMemberDetails(value, projectId.toString()) : null;
+ const selectedOption = projectId ? getProjectMemberDetails(value, projectId) : null;
return (
{
console.error(err);
@@ -131,6 +132,7 @@ export const ProjectSettingsMemberDefaults = observer(function ProjectSettingsMe
type: TOAST_TYPE.SUCCESS,
message: t("project_settings.general.toast.success"),
});
+ return undefined;
})
.catch((err) => {
console.error(err);
@@ -154,6 +156,7 @@ export const ProjectSettingsMemberDefaults = observer(function ProjectSettingsMe
submitChanges({ project_lead: val });
}}
isDisabled={!isAdmin}
+ projectId={projectId}
/>
)}
/>
@@ -178,6 +181,7 @@ export const ProjectSettingsMemberDefaults = observer(function ProjectSettingsMe
submitChanges({ default_assignee: val });
}}
isDisabled={!isAdmin}
+ projectId={projectId}
/>
)}
/>
diff --git a/plane-src/apps/web/core/components/workspace-notifications/detail/nodedc-notification-detail.tsx b/plane-src/apps/web/core/components/workspace-notifications/detail/nodedc-notification-detail.tsx
new file mode 100644
index 0000000..de1704e
--- /dev/null
+++ b/plane-src/apps/web/core/components/workspace-notifications/detail/nodedc-notification-detail.tsx
@@ -0,0 +1,148 @@
+"use client";
+
+/**
+ * Copyright (c) 2023-present Plane Software, Inc. and contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ * See the LICENSE file for details.
+ */
+
+import { useState } from "react";
+import { ArrowRight, BellRing, FolderKanban, UserRound, UsersRound } from "lucide-react";
+import { Button } from "@plane/propel/button";
+import { Avatar } from "@plane/ui";
+import { calculateTimeAgo, getFileURL } from "@plane/utils";
+import { closeWorkspaceNotificationsModal } from "@/components/workspace-notifications/notifications-modal.utils";
+import { useNotification } from "@/hooks/store/notifications/use-notification";
+import { useAppRouter } from "@/hooks/use-app-router";
+import { NotificationOption } from "../sidebar/notification-card/options";
+
+type TNodeDCNotificationDetailProps = {
+ notificationId: string;
+ workspaceSlug: string;
+};
+
+export const NodeDCNotificationDetail = (props: TNodeDCNotificationDetailProps) => {
+ const { notificationId, workspaceSlug } = props;
+ const router = useAppRouter();
+ const { asJson: notification } = useNotification(notificationId);
+ const [isSnoozeStateModalOpen, setIsSnoozeStateModalOpen] = useState(false);
+ const [customSnoozeModal, setCustomSnoozeModal] = useState(false);
+
+ if (!notification?.id) return <>;
+
+ const targetUrl = notification.data?.target_url;
+ const isProjectTarget = !!notification.data?.project_id || notification.sender?.includes("project_");
+ const actionLabel = isProjectTarget ? "Открыть проект" : "Перейти в пространство";
+ const actor = notification.triggered_by_details;
+ const contextItems = [
+ {
+ icon:
{notification.read_at === null && (
@@ -85,7 +111,7 @@ export const NotificationItem = observer(function NotificationItem(props: TNotif
+
+ );
+};
diff --git a/plane-src/apps/web/core/components/workspace-notifications/root.tsx b/plane-src/apps/web/core/components/workspace-notifications/root.tsx
index 8dc2d09..b4e3ee4 100644
--- a/plane-src/apps/web/core/components/workspace-notifications/root.tsx
+++ b/plane-src/apps/web/core/components/workspace-notifications/root.tsx
@@ -13,7 +13,9 @@ import { EmptyStateCompact } from "@plane/propel/empty-state";
import { cn } from "@plane/utils";
// components
import { LogoSpinner } from "@/components/common/logo-spinner";
+import { NodeDCNotificationDetail } from "@/components/workspace-notifications/detail/nodedc-notification-detail";
// hooks
+import { useNotification } from "@/hooks/store/notifications/use-notification";
import { useWorkspaceNotifications } from "@/hooks/store/notifications";
import { useWorkspace } from "@/hooks/store/use-workspace";
import { useUserPermissions } from "@/hooks/store/user";
@@ -40,9 +42,11 @@ export const NotificationsRoot = observer(function NotificationsRoot({ workspace
} = useWorkspaceNotifications();
const { fetchUserProjectInfo } = useUserPermissions();
const { isWorkItem, PeekOverviewComponent, setPeekWorkItem } = useNotificationPreview();
+ const { asJson: selectedNotification } = useNotification(currentSelectedNotificationId);
// derived values
const { workspace_slug, project_id, issue_id, is_inbox_issue, is_external_contour } =
notificationLiteByNotificationId(currentSelectedNotificationId);
+ const isNodeDCNotification = selectedNotification?.sender?.startsWith("in_app:nodedc:") ?? false;
// fetching workspace work item properties
useWorkspaceIssueProperties(workspaceSlug);
@@ -128,6 +132,8 @@ export const NotificationsRoot = observer(function NotificationsRoot({ workspace
/>
)}
+ ) : isNodeDCNotification && workspaceSlug ? (
+
+
+
+
+
+
+ NODE.DC уведомление
+
+
+ {notification.created_at ? calculateTimeAgo(notification.created_at) : "Новое событие"}
+
+
+ {targetUrl && (
+ }
+ >
+ {actionLabel}
+
+ )}
+
+
+
+
+
+
+
+
+
+
+
+ {contextItems.length > 0 && (
+
+ {actor ? (
+
+
+
+ + {notification.title || "Новое событие в Tasker"} +
++ {notification.message_stripped || + [notification.data?.project_name, notification.data?.workspace_name].filter(Boolean).join(" · ")} +
+ {actor?.display_name && ( +
+ Инициатор: {actor.display_name}
+
+ )}
+
+ {contextItems.map((item) => (
+
+ )}
+
+
+ ))}
+
+ {item.icon}
+ {item.label}
+
+ {item.value}
+
- {notificationTriggeredBy && (
+ {notificationTriggeredBy ? (
)}
-
- {notification?.data?.issue?.identifier}-{notification?.data?.issue?.sequence_id}
- {notification?.data?.issue?.name}
+ {isIssueNotification ? (
+ <>
+ {notification?.data?.issue?.identifier}-{notification?.data?.issue?.sequence_id}
+ {notification?.data?.issue?.name}
+
+ ) : (
+ <>
+ {notification.message_stripped ||
+ [notification.data?.project_name, notification.data?.workspace_name].filter(Boolean).join(" · ")}
+
+ )}
{notification?.snoozed_till ? (
diff --git a/plane-src/apps/web/core/lib/wrappers/authentication-wrapper.tsx b/plane-src/apps/web/core/lib/wrappers/authentication-wrapper.tsx
index a8ae0ed..a3a8012 100644
--- a/plane-src/apps/web/core/lib/wrappers/authentication-wrapper.tsx
+++ b/plane-src/apps/web/core/lib/wrappers/authentication-wrapper.tsx
@@ -4,10 +4,11 @@
* See the LICENSE file for details.
*/
-import type { ReactNode } from "react";
+import { useEffect, useRef, type ReactNode } from "react";
import { observer } from "mobx-react";
import { useSearchParams, usePathname } from "next/navigation";
import useSWR from "swr";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// components
import { LogoSpinner } from "@/components/common/logo-spinner";
// helpers
@@ -17,6 +18,10 @@ import { buildNodeDCOIDCLoginUrl, getCurrentRelativePath, shouldUseNodeDCOIDC }
import { useWorkspace } from "@/hooks/store/use-workspace";
import { useUser, useUserProfile, useUserSettings } from "@/hooks/store/user";
import { useAppRouter } from "@/hooks/use-app-router";
+// services
+import { WorkspaceService } from "@/services/workspace.service";
+
+const workspaceService = new WorkspaceService();
type TPageType = EPageTypes;
@@ -35,6 +40,7 @@ export const AuthenticationWrapper = observer(function AuthenticationWrapper(pro
const router = useAppRouter();
const searchParams = useSearchParams();
const nextPath = searchParams.get("next_path");
+ const pendingInviteToastKey = useRef(undefined);
// props
const { children, pageType = EPageTypes.AUTHENTICATED } = props;
// hooks
@@ -55,6 +61,47 @@ export const AuthenticationWrapper = observer(function AuthenticationWrapper(pro
currentUserProfile?.onboarding_step?.workspace_invite &&
currentUserProfile?.onboarding_step?.workspace_join) ||
false;
+ const shouldWatchPendingInvites =
+ pageType === EPageTypes.AUTHENTICATED && !!currentUser?.id && isUserOnboard && pathname !== "/invitations";
+
+ const { data: pendingWorkspaceInvitations } = useSWR(
+ shouldWatchPendingInvites ? "USER_WORKSPACE_INVITATIONS_NOTICE" : null,
+ () => workspaceService.userWorkspaceInvitations(),
+ {
+ refreshInterval: 15000,
+ revalidateOnFocus: true,
+ shouldRetryOnError: false,
+ }
+ );
+
+ useEffect(() => {
+ if (!shouldWatchPendingInvites || !pendingWorkspaceInvitations?.length) return;
+
+ const inviteKey = pendingWorkspaceInvitations
+ .map((invitation) => invitation.id)
+ .toSorted()
+ .join(":");
+ if (pendingInviteToastKey.current === inviteKey) return;
+ pendingInviteToastKey.current = inviteKey;
+
+ setToast({
+ type: TOAST_TYPE.INFO,
+ title: "Новое приглашение в Tasker",
+ message:
+ pendingWorkspaceInvitations.length === 1
+ ? "Вам отправили доступ в workspace. Откройте приглашения, чтобы принять его."
+ : `У вас ${pendingWorkspaceInvitations.length} ожидающих приглашений. Откройте список, чтобы принять доступы.`,
+ actionItems: (
+
+ ),
+ });
+ }, [pendingWorkspaceInvitations, router, shouldWatchPendingInvites]);
const getWorkspaceRedirectionUrl = (): string => {
let redirectionRoute = "/create-workspace";
diff --git a/plane-src/packages/types/src/workspace-notifications.ts b/plane-src/packages/types/src/workspace-notifications.ts
index a6c35b7..86b507d 100644
--- a/plane-src/packages/types/src/workspace-notifications.ts
+++ b/plane-src/packages/types/src/workspace-notifications.ts
@@ -34,8 +34,8 @@ export type TNotificationIssueLite = {
};
export type TNotificationData = {
- issue: TNotificationIssueLite | undefined;
- issue_activity: {
+ issue?: TNotificationIssueLite | undefined;
+ issue_activity?: {
id: string | undefined;
actor: string | undefined;
field: string | undefined;
@@ -44,6 +44,14 @@ export type TNotificationData = {
new_value: string | undefined;
old_value: string | undefined;
};
+ notification_type?: string;
+ target_url?: string;
+ workspace_slug?: string;
+ workspace_name?: string;
+ project_id?: string;
+ project_name?: string;
+ invitee_email?: string;
+ role?: number;
};
export type TNotification = {