mirror of
https://github.com/makeplane/plane.git
synced 2026-07-13 05:49:40 +02:00
Merge branch 'develop' of github.com:makeplane/plane-ee into preview
This commit is contained in:
@@ -27,7 +27,7 @@ export const IssueLinkList: FC<TIssueLinkList> = observer((props) => {
|
||||
if (!issueLinks) return <></>;
|
||||
|
||||
return (
|
||||
<div className="grid grid-cols-12 3xl:grid-cols-10 gap-2 px-9 py-4">
|
||||
<div className="space-y-2">
|
||||
{issueLinks &&
|
||||
issueLinks.length > 0 &&
|
||||
issueLinks.map((linkId) => (
|
||||
|
||||
@@ -29,7 +29,7 @@ export const NotificationAppSidebarOption: FC<TNotificationAppSidebarOption> = o
|
||||
return <div className="absolute right-3.5 top-2 h-2 w-2 rounded-full bg-custom-primary-300" />;
|
||||
|
||||
return (
|
||||
<div className="text-[8px] ml-auto bg-custom-primary-100 text-white p-1 py-0.5 rounded-full">
|
||||
<div className="ml-auto px-2.5 py-0.5 bg-custom-primary-100/20 text-custom-primary-100 text-xs font-semibold rounded-xl">
|
||||
{getNumberCount(unreadNotificationsCount.total_unread_notifications_count)}
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -3,13 +3,15 @@
|
||||
import { FC } from "react";
|
||||
import { observer } from "mobx-react";
|
||||
import { Bell } from "lucide-react";
|
||||
import { Breadcrumbs } from "@plane/ui";
|
||||
import { Breadcrumbs, Tooltip } from "@plane/ui";
|
||||
// components
|
||||
import { BreadcrumbLink } from "@/components/common";
|
||||
import { SidebarHamburgerToggle } from "@/components/core";
|
||||
import { NotificationSidebarHeaderOptions } from "@/components/workspace-notifications";
|
||||
// helpers
|
||||
import { getNumberCount } from "@/helpers/string.helper";
|
||||
// hooks
|
||||
import { usePlatformOS } from "@/hooks/use-platform-os";
|
||||
|
||||
type TNotificationSidebarHeader = {
|
||||
workspaceSlug: string;
|
||||
@@ -18,6 +20,8 @@ type TNotificationSidebarHeader = {
|
||||
|
||||
export const NotificationSidebarHeader: FC<TNotificationSidebarHeader> = observer((props) => {
|
||||
const { workspaceSlug, notificationsCount } = props;
|
||||
// hooks
|
||||
const { isMobile } = usePlatformOS();
|
||||
|
||||
if (!workspaceSlug) return <></>;
|
||||
return (
|
||||
@@ -34,9 +38,15 @@ export const NotificationSidebarHeader: FC<TNotificationSidebarHeader> = observe
|
||||
label={
|
||||
<div className="flex items-center gap-2">
|
||||
<div className="font-medium">Notifications</div>
|
||||
<div className="rounded-full text-xs px-1.5 py-0.5 bg-custom-primary-100 text-white">
|
||||
{getNumberCount(notificationsCount)}
|
||||
</div>
|
||||
<Tooltip
|
||||
isMobile={isMobile}
|
||||
tooltipContent={`There are ${notificationsCount} ${notificationsCount > 1 ? "notifications" : "notification"} in this workspace`}
|
||||
position="bottom"
|
||||
>
|
||||
<div className="px-2.5 py-0.5 bg-custom-primary-100/20 text-custom-primary-100 text-xs font-semibold rounded-xl">
|
||||
{getNumberCount(notificationsCount)}
|
||||
</div>
|
||||
</Tooltip>
|
||||
</div>
|
||||
}
|
||||
icon={<Bell className="h-4 w-4 text-custom-text-300" />}
|
||||
|
||||
@@ -1067,7 +1067,7 @@ export abstract class BaseIssuesStore implements IBaseIssuesStore {
|
||||
currentModuleIds = uniq(concat([...currentModuleIds], moduleIds));
|
||||
|
||||
// For current Issue, update module Ids by calling current store's update Issue, without making an API call
|
||||
this.updateIssue(workspaceSlug, projectId, issueId, { module_ids: currentModuleIds }, false);
|
||||
this.issueUpdate(workspaceSlug, projectId, issueId, { module_ids: currentModuleIds }, false);
|
||||
});
|
||||
|
||||
if (moduleIds.includes(this.moduleId ?? "")) {
|
||||
|
||||
@@ -118,6 +118,16 @@ export const PlaneOneModal: FC<PlaneOneModalProps> = observer((props) => {
|
||||
<svg viewBox="0 0 2 2" className="h-0.5 w-0.5 fill-current">
|
||||
<circle cx={1} cy={1} r={1} />
|
||||
</svg>
|
||||
<a
|
||||
href="https://plane.so/changelog/one"
|
||||
target="_blank"
|
||||
className="text-sm text-custom-text-200 hover:text-custom-text-100 hover:underline underline-offset-1 outline-none"
|
||||
>
|
||||
Full Changelog
|
||||
</a>
|
||||
<svg viewBox="0 0 2 2" className="h-0.5 w-0.5 fill-current">
|
||||
<circle cx={1} cy={1} r={1} />
|
||||
</svg>
|
||||
<a
|
||||
href="mailto:support@plane.so"
|
||||
target="_blank"
|
||||
|
||||
Reference in New Issue
Block a user