Addressed PR feedback

Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>
This commit is contained in:
Marcus Noble 2021-12-28 11:44:26 +00:00
parent de8cb1225a
commit 31fcdbb8b1
No known key found for this signature in database
GPG Key ID: B8F2DB8A7AEBAF78
4 changed files with 41 additions and 20 deletions

View File

@ -50,7 +50,6 @@ import {
DatagridHeaderCell,
useListContext,
FunctionField,
ImageField,
} from "react-admin";
import { Link } from "react-router-dom";
import { ServerNoticeButton, ServerNoticeBulkButton } from "./ServerNotices";
@ -61,8 +60,15 @@ import {
DeleteMediaBulkButton,
} from "./media";
import { makeStyles } from "@material-ui/core/styles";
import { TableHead, TableRow, TableCell, Checkbox } from "@material-ui/core";
import {
TableHead,
TableRow,
TableCell,
Checkbox,
Tooltip,
} from "@material-ui/core";
import classnames from "classnames";
import BrokenImageIcon from "@material-ui/icons/BrokenImage";
const redirect = () => {
return {
@ -593,32 +599,41 @@ export const UserEdit = props => {
header={<UserMediaDatagridHeader />}
>
<FunctionField
label="Image"
label="resources.users_media.image"
render={record => {
let data = {
title: record.upload_name,
imgURL: `${localStorage.getItem(
"base_url"
)}/_matrix/media/v1/thumbnail/${localStorage.getItem(
"home_server"
)}/${record.media_id}?width=50&height=50&method=crop`,
title:
record.media_type.startsWith("image") &&
record.media_length
? record.upload_name || record.media_id
: translate(
"resources.users_media.preview_unavailable"
),
imgURL: record.media_type.startsWith("image")
? `${localStorage.getItem(
"base_url"
)}/_matrix/media/v1/thumbnail/${localStorage.getItem(
"home_server"
)}/${record.media_id}?width=40&height=40&method=crop`
: null,
downloadURL: `${localStorage.getItem(
"base_url"
)}/_matrix/media/r0/download/${localStorage.getItem(
"home_server"
)}/${record.media_id}`,
};
if (record.media_type.startsWith("image")) {
return (
<ImageField
record={data}
source="imgURL"
onClick={() => window.open(data.downloadURL)}
/>
);
} else {
return "Preview unavailable";
}
return (
<Tooltip title={data["title"]}>
<Avatar
src={data["imgURL"]}
onClick={() => window.open(data["downloadURL"])}
variant="square"
>
<BrokenImageIcon />
</Avatar>
</Tooltip>
);
}}
/>
<DateField

View File

@ -245,6 +245,8 @@ const de = {
created_ts: "Erstellt",
last_access_ts: "Letzter Zugriff",
},
image: "Bild",
preview_unavailable: "Vorschau nicht verfügbar",
},
delete_media: {
name: "Medien",

View File

@ -241,6 +241,8 @@ const en = {
created_ts: "Created",
last_access_ts: "Last access",
},
image: "Image",
preview_unavailable: "Preview unavailable",
},
delete_media: {
name: "Media",

View File

@ -231,6 +231,8 @@ const zh = {
created_ts: "创建",
last_access_ts: "上一次访问",
},
image: "图片",
preview_unavailable: "预览不可用",
},
delete_media: {
name: "媒体文件",