Skip to content

Commit 950fcfd

Browse files
authored
[WIKI-391] chore: handle deactivated user display name in version history #7171
1 parent 053c895 commit 950fcfd

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

web/core/components/core/description-versions/dropdown-item.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const DescriptionVersionsDropdownItem: React.FC<Props> = observer((props)
3131
/>
3232
</span>
3333
<p className="text-xs text-custom-text-200 flex items-center gap-1.5">
34-
<span className="font-medium">{versionCreator?.display_name}</span>
34+
<span className="font-medium">{versionCreator?.display_name ?? t("common.deactivated_user")}</span>
3535
<span>{calculateTimeAgo(version.last_saved_at)}</span>
3636
</p>
3737
</CustomMenu.MenuItem>

web/core/components/core/description-versions/dropdown.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ export const DescriptionVersionsDropdown: React.FC<Props> = observer((props) =>
4040
</span>
4141
<p className="text-xs">
4242
{t("description_versions.last_edited_by")}{" "}
43-
<span className="font-medium">{lastUpdatedByUserDisplayName}</span> {calculateTimeAgo(lastUpdatedAt)}
43+
<span className="font-medium">{lastUpdatedByUserDisplayName ?? t("common.deactivated_user")}</span>{" "}
44+
{calculateTimeAgo(lastUpdatedAt)}
4445
</p>
4546
</div>
4647
}

web/core/components/pages/version/sidebar-list-item.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { observer } from "mobx-react";
22
import Link from "next/link";
3-
// plane types
3+
// plane imports
4+
import { useTranslation } from "@plane/i18n";
45
import { TPageVersion } from "@plane/types";
5-
// plane ui
66
import { Avatar } from "@plane/ui";
77
// helpers
88
import { cn } from "@/helpers/common.helper";
@@ -23,6 +23,8 @@ export const PlaneVersionsSidebarListItem: React.FC<Props> = observer((props) =>
2323
const { getUserDetails } = useMember();
2424
// derived values
2525
const ownerDetails = getUserDetails(version.owned_by);
26+
// translation
27+
const { t } = useTranslation();
2628

2729
return (
2830
<Link
@@ -42,7 +44,7 @@ export const PlaneVersionsSidebarListItem: React.FC<Props> = observer((props) =>
4244
size="sm"
4345
className="flex-shrink-0"
4446
/>
45-
<span className="text-custom-text-300">{ownerDetails?.display_name}</span>
47+
<span className="text-custom-text-300">{ownerDetails?.display_name ?? t("common.deactivated_user")}</span>
4648
</p>
4749
</Link>
4850
);

0 commit comments

Comments
 (0)