mirror of
https://github.com/makeplane/plane.git
synced 2025-12-20 21:59:34 +01:00
[WIKI-391] chore: handle deactivated user display name in version history #7171
This commit is contained in:
committed by
GitHub
parent
053c895120
commit
950fcfdb40
@@ -31,7 +31,7 @@ export const DescriptionVersionsDropdownItem: React.FC<Props> = observer((props)
|
|||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
<p className="text-xs text-custom-text-200 flex items-center gap-1.5">
|
<p className="text-xs text-custom-text-200 flex items-center gap-1.5">
|
||||||
<span className="font-medium">{versionCreator?.display_name}</span>
|
<span className="font-medium">{versionCreator?.display_name ?? t("common.deactivated_user")}</span>
|
||||||
<span>{calculateTimeAgo(version.last_saved_at)}</span>
|
<span>{calculateTimeAgo(version.last_saved_at)}</span>
|
||||||
</p>
|
</p>
|
||||||
</CustomMenu.MenuItem>
|
</CustomMenu.MenuItem>
|
||||||
|
|||||||
@@ -40,7 +40,8 @@ export const DescriptionVersionsDropdown: React.FC<Props> = observer((props) =>
|
|||||||
</span>
|
</span>
|
||||||
<p className="text-xs">
|
<p className="text-xs">
|
||||||
{t("description_versions.last_edited_by")}{" "}
|
{t("description_versions.last_edited_by")}{" "}
|
||||||
<span className="font-medium">{lastUpdatedByUserDisplayName}</span> {calculateTimeAgo(lastUpdatedAt)}
|
<span className="font-medium">{lastUpdatedByUserDisplayName ?? t("common.deactivated_user")}</span>{" "}
|
||||||
|
{calculateTimeAgo(lastUpdatedAt)}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import { observer } from "mobx-react";
|
import { observer } from "mobx-react";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
// plane types
|
// plane imports
|
||||||
|
import { useTranslation } from "@plane/i18n";
|
||||||
import { TPageVersion } from "@plane/types";
|
import { TPageVersion } from "@plane/types";
|
||||||
// plane ui
|
|
||||||
import { Avatar } from "@plane/ui";
|
import { Avatar } from "@plane/ui";
|
||||||
// helpers
|
// helpers
|
||||||
import { cn } from "@/helpers/common.helper";
|
import { cn } from "@/helpers/common.helper";
|
||||||
@@ -23,6 +23,8 @@ export const PlaneVersionsSidebarListItem: React.FC<Props> = observer((props) =>
|
|||||||
const { getUserDetails } = useMember();
|
const { getUserDetails } = useMember();
|
||||||
// derived values
|
// derived values
|
||||||
const ownerDetails = getUserDetails(version.owned_by);
|
const ownerDetails = getUserDetails(version.owned_by);
|
||||||
|
// translation
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Link
|
<Link
|
||||||
@@ -42,7 +44,7 @@ export const PlaneVersionsSidebarListItem: React.FC<Props> = observer((props) =>
|
|||||||
size="sm"
|
size="sm"
|
||||||
className="flex-shrink-0"
|
className="flex-shrink-0"
|
||||||
/>
|
/>
|
||||||
<span className="text-custom-text-300">{ownerDetails?.display_name}</span>
|
<span className="text-custom-text-300">{ownerDetails?.display_name ?? t("common.deactivated_user")}</span>
|
||||||
</p>
|
</p>
|
||||||
</Link>
|
</Link>
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user