Skip to content

Commit 0ceb7d0

Browse files
committed
Fix #4838 when showing avatars of deleted users
1 parent f35671d commit 0ceb7d0

File tree

8 files changed

+14
-9
lines changed

8 files changed

+14
-9
lines changed

frontend/src/components/Table/Formatter/GravatarFormatter.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
const defaultImg = "/images/default-avatar.jpg";
2+
13
interface Props {
2-
url: string;
4+
url?: string;
35
name?: string;
46
}
57
export function GravatarFormatter({ url, name }: Props) {
@@ -9,7 +11,7 @@ export function GravatarFormatter({ url, name }: Props) {
911
title={name}
1012
className="avatar avatar-2 me-2"
1113
style={{
12-
backgroundImage: `url(${url})`,
14+
backgroundImage: `url(${url || defaultImg})`,
1315
}}
1416
/>
1517
</div>

frontend/src/pages/Access/Table.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ export default function Table({ data, isFetching, isFiltered, onEdit, onDelete,
2121
() => [
2222
columnHelper.accessor((row: any) => row.owner, {
2323
id: "owner",
24-
cell: (info: any) => <GravatarFormatter url={info.getValue().avatar} name={info.getValue().name} />,
24+
cell: (info: any) => {
25+
const value = info.getValue();
26+
return <GravatarFormatter url={value ? value.avatar : ""} name={value ? value.name : ""} />;
27+
},
2528
meta: {
2629
className: "w-1",
2730
},

frontend/src/pages/AuditLog/Table.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export default function Table({ data, isFetching, onSelectItem }: Props) {
1818
id: "user.avatar",
1919
cell: (info: any) => {
2020
const value = info.getValue();
21-
return <GravatarFormatter url={value.avatar} name={value.name} />;
21+
return <GravatarFormatter url={value ? value.avatar : ""} name={value ? value.name : ""} />;
2222
},
2323
meta: {
2424
className: "w-1",

frontend/src/pages/Certificates/Table.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default function Table({ data, isFetching, onDelete, onRenew, onDownload,
3131
id: "owner",
3232
cell: (info: any) => {
3333
const value = info.getValue();
34-
return <GravatarFormatter url={value.avatar} name={value.name} />;
34+
return <GravatarFormatter url={value ? value.avatar : ""} name={value ? value.name : ""} />;
3535
},
3636
meta: {
3737
className: "w-1",

frontend/src/pages/Nginx/DeadHosts/Table.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default function Table({ data, isFetching, onEdit, onDelete, onDisableTog
3131
id: "owner",
3232
cell: (info: any) => {
3333
const value = info.getValue();
34-
return <GravatarFormatter url={value.avatar} name={value.name} />;
34+
return <GravatarFormatter url={value ? value.avatar : ""} name={value ? value.name : ""} />;
3535
},
3636
meta: {
3737
className: "w-1",

frontend/src/pages/Nginx/ProxyHosts/Table.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default function Table({ data, isFetching, onEdit, onDelete, onDisableTog
3232
id: "owner",
3333
cell: (info: any) => {
3434
const value = info.getValue();
35-
return <GravatarFormatter url={value.avatar} name={value.name} />;
35+
return <GravatarFormatter url={value ? value.avatar : ""} name={value ? value.name : ""} />;
3636
},
3737
meta: {
3838
className: "w-1",

frontend/src/pages/Nginx/RedirectionHosts/Table.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default function Table({ data, isFetching, onEdit, onDelete, onDisableTog
3131
id: "owner",
3232
cell: (info: any) => {
3333
const value = info.getValue();
34-
return <GravatarFormatter url={value.avatar} name={value.name} />;
34+
return <GravatarFormatter url={value ? value.avatar : ""} name={value ? value.name : ""} />;
3535
},
3636
meta: {
3737
className: "w-1",

frontend/src/pages/Nginx/Streams/Table.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default function Table({ data, isFetching, isFiltered, onEdit, onDelete,
3131
id: "owner",
3232
cell: (info: any) => {
3333
const value = info.getValue();
34-
return <GravatarFormatter url={value.avatar} name={value.name} />;
34+
return <GravatarFormatter url={value ? value.avatar : ""} name={value ? value.name : ""} />;
3535
},
3636
meta: {
3737
className: "w-1",

0 commit comments

Comments
 (0)