diff --git a/package.json b/package.json index 453bf03..d4ff0b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "synapse-admin", - "version": "0.7.0", + "version": "0.8.0", "description": "Admin GUI for the Matrix.org server Synapse", "author": "Awesome Technologies Innovationslabor GmbH", "license": "Apache-2.0", @@ -25,6 +25,7 @@ "dependencies": { "papaparse": "^5.2.0", "prop-types": "^15.7.2", + "ra-language-chinese": "^2.0.10", "ra-language-german": "^2.1.2", "react": "^17.0.0", "react-admin": "^3.14.0", diff --git a/src/App.js b/src/App.js index 3afdff8..54c05f8 100644 --- a/src/App.js +++ b/src/App.js @@ -12,15 +12,19 @@ import EqualizerIcon from "@material-ui/icons/Equalizer"; import { UserMediaStatsList } from "./components/statistics"; import RoomIcon from "@material-ui/icons/ViewList"; import ReportIcon from "@material-ui/icons/Warning"; +import FolderSharedIcon from "@material-ui/icons/FolderShared"; import { ImportFeature } from "./components/ImportFeature"; +import { RoomDirectoryList } from "./components/RoomDirectory"; import { Route } from "react-router-dom"; import germanMessages from "./i18n/de"; import englishMessages from "./i18n/en"; +import chineseMessages from "./i18n/zh"; // TODO: Can we use lazy loading together with browser locale? const messages = { de: germanMessages, en: englishMessages, + zh: chineseMessages, }; const i18nProvider = polyglotI18nProvider( locale => (messages[locale] ? messages[locale] : messages.en), @@ -57,6 +61,11 @@ const App = () => ( show={ReportShow} icon={ReportIcon} /> + @@ -64,6 +73,7 @@ const App = () => ( + ); diff --git a/src/components/LoginPage.js b/src/components/LoginPage.js index 3058b45..4c222a3 100644 --- a/src/components/LoginPage.js +++ b/src/components/LoginPage.js @@ -255,6 +255,7 @@ const LoginPage = ({ theme }) => { > Deutsch English + 简体中文 diff --git a/src/components/RoomDirectory.js b/src/components/RoomDirectory.js new file mode 100644 index 0000000..654c824 --- /dev/null +++ b/src/components/RoomDirectory.js @@ -0,0 +1,252 @@ +import React, { Fragment } from "react"; +import Avatar from "@material-ui/core/Avatar"; +import { Chip } from "@material-ui/core"; +import { connect } from "react-redux"; +import FolderSharedIcon from "@material-ui/icons/FolderShared"; +import { makeStyles } from "@material-ui/core/styles"; +import { + BooleanField, + BulkDeleteButton, + Button, + Datagrid, + DeleteButton, + Filter, + List, + NumberField, + Pagination, + TextField, + useCreate, + useMutation, + useNotify, + useTranslate, + useRefresh, + useUnselectAll, +} from "react-admin"; + +const useStyles = makeStyles({ + small: { + height: "40px", + width: "40px", + }, +}); + +const RoomDirectoryPagination = props => ( + +); + +export const RoomDirectoryDeleteButton = props => { + const translate = useTranslate(); + + return ( + } + /> + ); +}; + +export const RoomDirectoryBulkDeleteButton = props => ( + } + /> +); + +export const RoomDirectoryBulkSaveButton = ({ selectedIds }) => { + const notify = useNotify(); + const refresh = useRefresh(); + const unselectAll = useUnselectAll(); + const [createMany, { loading }] = useMutation(); + + const handleSend = values => { + createMany( + { + type: "createMany", + resource: "room_directory", + payload: { ids: selectedIds, data: {} }, + }, + { + onSuccess: ({ data }) => { + notify("resources.room_directory.action.send_success"); + unselectAll("rooms"); + refresh(); + }, + onFailure: error => + notify("resources.room_directory.action.send_failure", "error"), + } + ); + }; + + return ( + + ); +}; + +export const RoomDirectorySaveButton = ({ record }) => { + const notify = useNotify(); + const refresh = useRefresh(); + const [create, { loading }] = useCreate("room_directory"); + + const handleSend = values => { + create( + { + payload: { data: { id: record.id } }, + }, + { + onSuccess: ({ data }) => { + notify("resources.room_directory.action.send_success"); + refresh(); + }, + onFailure: error => + notify("resources.room_directory.action.send_failure", "error"), + } + ); + }; + + return ( + + ); +}; + +const RoomDirectoryBulkActionButtons = props => ( + + + +); + +const AvatarField = ({ source, className, record = {} }) => ( + +); + +const RoomDirectoryFilter = ({ ...props }) => { + const translate = useTranslate(); + return ( + + + + + + ); +}; + +export const FilterableRoomDirectoryList = ({ ...props }) => { + const classes = useStyles(); + const translate = useTranslate(); + const filter = props.roomDirectoryFilters; + const roomIdFilter = filter && filter.room_id ? true : false; + const topicFilter = filter && filter.topic ? true : false; + const canonicalAliasFilter = filter && filter.canonical_alias ? true : false; + + return ( + } + bulkActionButtons={} + filters={} + perPage={100} + > + + + + {roomIdFilter && ( + + )} + {canonicalAliasFilter && ( + + )} + {topicFilter && ( + + )} + + + + + + ); +}; + +function mapStateToProps(state) { + return { + roomDirectoryFilters: + state.admin.resources.room_directory.list.params.displayedFilters, + }; +} + +export const RoomDirectoryList = connect(mapStateToProps)( + FilterableRoomDirectoryList +); diff --git a/src/components/rooms.js b/src/components/rooms.js index efef5cb..e89b786 100644 --- a/src/components/rooms.js +++ b/src/components/rooms.js @@ -2,7 +2,8 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { BooleanField, - BulkDeleteWithConfirmButton, + BulkDeleteButton, + DateField, Datagrid, DeleteButton, Filter, @@ -27,6 +28,13 @@ import PageviewIcon from "@material-ui/icons/Pageview"; import UserIcon from "@material-ui/icons/Group"; import ViewListIcon from "@material-ui/icons/ViewList"; import VisibilityIcon from "@material-ui/icons/Visibility"; +import EventIcon from "@material-ui/icons/Event"; +import { + RoomDirectoryBulkDeleteButton, + RoomDirectoryBulkSaveButton, + RoomDirectoryDeleteButton, + RoomDirectorySaveButton, +} from "./RoomDirectory"; const RoomPagination = props => ( @@ -73,16 +81,26 @@ const RoomTitle = ({ record }) => { }; const RoomShowActions = ({ basePath, data, resource }) => { - const translate = useTranslate(); + var roomDirectoryStatus = ""; + if (data) { + roomDirectoryStatus = data.public; + } + return ( + {roomDirectoryStatus === false && ( + + )} + {roomDirectoryStatus === true && ( + + )} ); @@ -97,7 +115,9 @@ export const RoomShow = props => { - + + + { > + { ]} /> + } + path="state" + > + + + + + + + + + + + ); @@ -204,7 +261,14 @@ export const RoomShow = props => { const RoomBulkActionButtons = props => ( - + + + ); @@ -248,7 +312,6 @@ const FilterableRoomList = ({ ...props }) => { const stateEventsFilter = filter && filter.state_events ? true : false; const versionFilter = filter && filter.version ? true : false; const federateableFilter = filter && filter.federatable ? true : false; - const translate = useTranslate(); return ( { pagination={} sort={{ field: "name", order: "ASC" }} filters={} - bulkActionButtons={ - - } + bulkActionButtons={} > ( ); -const UserBulkActionButtons = props => { - const translate = useTranslate(); - return ( - - - - - ); -}; +const UserBulkActionButtons = props => ( + + + + +); const AvatarField = ({ source, className, record = {} }) => ( @@ -239,7 +237,10 @@ const UserEditToolbar = props => { @@ -454,7 +455,7 @@ export const UserEdit = props => { - + diff --git a/src/i18n/de.js b/src/i18n/de.js index 556a4cd..a221ca4 100644 --- a/src/i18n/de.js +++ b/src/i18n/de.js @@ -23,11 +23,6 @@ export default { detail: "Details", permission: "Berechtigungen", }, - delete: { - title: "Raum löschen", - message: - "Sind Sie sicher dass Sie den Raum löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden. Alle Nachrichten und Medien, die der Raum beinhaltet werden vom Server gelöscht!", - }, }, reports: { tabs: { basic: "Allgemein", detail: "Details" } }, }, @@ -143,16 +138,19 @@ export default { canonical_alias: "Alias", joined_members: "Mitglieder", joined_local_members: "Lokale Mitglieder", - state_events: "Ereignisse", + joined_local_devices: "Lokale Endgeräte", + state_events: "Zustandsereignisse / Komplexität", version: "Version", is_encrypted: "Verschlüsselt", encryption: "Verschlüsselungs-Algorithmus", federatable: "Fö­de­rierbar", - public: "Öffentlich", + public: "Sichtbar im Raumverzeichnis", creator: "Ersteller", join_rules: "Beitrittsregeln", guest_access: "Gastzugriff", history_visibility: "Historie-Sichtbarkeit", + topic: "Thema", + avatar: "Avatar", }, enums: { join_rules: { @@ -173,6 +171,13 @@ export default { }, unencrypted: "Nicht verschlüsselt", }, + action: { + erase: { + title: "Raum löschen", + content: + "Sind Sie sicher dass Sie den Raum löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden. Alle Nachrichten und Medien, die der Raum beinhaltet werden vom Server gelöscht!", + }, + }, }, reports: { name: "Ereignisbericht |||| Ereignisberichte", @@ -290,6 +295,32 @@ export default { media_length: "Größe der Dateien", }, }, + room_state: { + name: "Zustandsereignisse", + fields: { + type: "Typ", + content: "Inhalt", + origin_server_ts: "Sendezeit", + sender: "Absender", + }, + }, + room_directory: { + name: "Raumverzeichnis", + fields: { + world_readable: "Gastbenutzer dürfen ohne Beitritt lesen", + guest_can_join: "Gastbenutzer dürfen beitreten", + }, + action: { + title: + "Raum aus Verzeichnis löschen |||| %{smart_count} Räume aus Verzeichnis löschen", + content: + "Möchten Sie den Raum wirklich aus dem Raumverzeichnis löschen? |||| Möchten Sie die %{smart_count} Räume wirklich aus dem Raumverzeichnis löschen?", + erase: "Lösche aus Verzeichnis", + create: "Eintragen ins Verzeichnis", + send_success: "Raum erfolgreich eingetragen.", + send_failure: "Beim Entfernen ist ein Fehler aufgetreten.", + }, + }, }, ra: { ...germanMessages.ra, diff --git a/src/i18n/en.js b/src/i18n/en.js index 2ea370b..97573dc 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -22,11 +22,6 @@ export default { detail: "Details", permission: "Permissions", }, - delete: { - title: "Delete room", - message: - "Are you sure you want to delete the room? This cannot be undone. All messages and shared media in the room will be deleted from the server!", - }, }, reports: { tabs: { basic: "Basic", detail: "Details" } }, }, @@ -141,16 +136,19 @@ export default { canonical_alias: "Alias", joined_members: "Members", joined_local_members: "Local members", - state_events: "State events", + joined_local_devices: "Local devices", + state_events: "State events / Complexity", version: "Version", is_encrypted: "Encrypted", encryption: "Encryption", federatable: "Federatable", - public: "Public", + public: "Visible in room directory", creator: "Creator", join_rules: "Join rules", guest_access: "Guest access", history_visibility: "History visibility", + topic: "Topic", + avatar: "Avatar", }, enums: { join_rules: { @@ -171,6 +169,11 @@ export default { }, unencrypted: "Unencrypted", }, + erase: { + title: "Delete room", + content: + "Are you sure you want to delete the room? This cannot be undone. All messages and shared media in the room will be deleted from the server!", + }, }, reports: { name: "Reported event |||| Reported events", @@ -288,5 +291,31 @@ export default { media_length: "Media length", }, }, + room_state: { + name: "State events", + fields: { + type: "Type", + content: "Content", + origin_server_ts: "time of send", + sender: "Sender", + }, + }, + room_directory: { + name: "Room directory", + fields: { + world_readable: "guest users may view without joining", + guest_can_join: "guest users may join", + }, + action: { + title: + "Delete room from directory |||| Delete %{smart_count} rooms from directory", + content: + "Are you sure you want to remove this room from directory? |||| Are you sure you want to remove these %{smart_count} rooms from directory", + erase: "Delete from room directory", + create: "Publish in room directory", + send_success: "Room successfully published.", + send_failure: "An error has occurred.", + }, + }, }, }; diff --git a/src/i18n/zh.js b/src/i18n/zh.js new file mode 100644 index 0000000..f1f2f71 --- /dev/null +++ b/src/i18n/zh.js @@ -0,0 +1,290 @@ +import chineseMessages from "ra-language-chinese"; + +export default { + ...chineseMessages, + synapseadmin: { + auth: { + base_url: "服务器 URL", + welcome: "欢迎来到 Synapse-admin", + server_version: "Synapse 版本", + username_error: "请输入完整有效的用户 ID: '@user:domain'", + protocol_error: "URL 需要以'http://'或'https://'作为起始", + url_error: "不是一个有效的 Matrix 服务器地址", + }, + users: { + invalid_user_id: + "必须要是一个有效的 Matrix 用户 ID ,例如 @user_id:homeserver", + }, + rooms: { + tabs: { + basic: "基本", + members: "成员", + detail: "细节", + permission: "权限", + }, + delete: { + title: "删除房间", + message: + "您确定要删除这个房间吗?该操作无法被撤销。这个房间里所有的消息和分享的媒体都将被从服务器上删除!", + }, + }, + reports: { tabs: { basic: "基本", detail: "细节" } }, + }, + import_users: { + error: { + at_entry: "在条目 %{entry}: %{message}", + error: "错误", + required_field: "需要的值 '%{field}' 未被设置。", + invalid_value: + "第 %{row} 行出现无效值。 '%{field}' 只可以是 'true' 或 'false'。", + unreasonably_big: "拒绝加载过大的文件: %{size} MB", + already_in_progress: "一个导入进程已经在运行中", + id_exits: "ID %{id} 已经存在", + }, + title: "通过 CSV 导入用户", + goToPdf: "转到 PDF", + cards: { + importstats: { + header: "导入用户", + users_total: + "%{smart_count} 用户在 CSV 文件中 |||| %{smart_count} 用户在 CSV 文件中", + guest_count: "%{smart_count} 访客 |||| %{smart_count} 访客", + admin_count: "%{smart_count} 管理员 |||| %{smart_count} 管理员", + }, + conflicts: { + header: "冲突处理策略", + mode: { + stop: "在冲突处停止", + skip: "显示错误并跳过冲突", + }, + }, + ids: { + header: "IDs", + all_ids_present: "每条记录的 ID", + count_ids_present: + "%{smart_count} 个含 ID 的记录 |||| %{smart_count} 个含 ID 的记录", + mode: { + ignore: "忽略 CSV 中的 ID 并创建新的", + update: "更新已经存在的记录", + }, + }, + passwords: { + header: "密码", + all_passwords_present: "每条记录的密码", + count_passwords_present: + "%{smart_count} 个含密码的记录 |||| %{smart_count} 个含密码的记录", + use_passwords: "使用 CSV 中标记的密码", + }, + upload: { + header: "导入 CSV 文件", + explanation: + "在这里,你可以上传一个用逗号分隔的文件,用于创建或更新用户。该文件必须包括 'id' 和 'displayname' 字段。你可以在这里下载并修改一个示例文件:", + }, + startImport: { + simulate_only: "模拟模式", + run_import: "导入", + }, + results: { + header: "导入结果", + total: "共计 %{smart_count} 条记录 |||| 共计 %{smart_count} 条记录", + successful: "%{smart_count} 条记录导入成功", + skipped: "跳过 %{smart_count} 条记录", + download_skipped: "下载跳过的记录", + with_error: + "%{smart_count} 条记录出现错误 ||| %{smart_count} 条记录出现错误", + simulated_only: "只是一次模拟运行", + }, + }, + }, + resources: { + users: { + backtolist: "回到列表", + name: "用户", + email: "邮箱", + msisdn: "电话", + threepid: "邮箱 / 电话", + fields: { + avatar: "邮箱", + id: "用户 ID", + name: "用户名", + is_guest: "访客", + admin: "服务器管理员", + deactivated: "被禁用", + guests: "显示访客", + show_deactivated: "显示被禁用的账户", + user_id: "搜索用户", + displayname: "显示名字", + password: "密码", + avatar_url: "头像 URL", + avatar_src: "头像", + medium: "Medium", + threepids: "3PIDs", + address: "地址", + creation_ts_ms: "创建时间戳", + consent_version: "协议版本", + }, + helper: { + deactivate: "您必须提供一串密码来激活账户。", + erase: "将用户标记为根据 GDPR 的要求抹除了", + }, + action: { + erase: "抹除用户信息", + }, + }, + rooms: { + name: "房间", + fields: { + room_id: "房间 ID", + name: "房间名", + canonical_alias: "别名", + joined_members: "成员", + joined_local_members: "本地成员", + state_events: "状态事件", + version: "版本", + is_encrypted: "已经加密", + encryption: "加密", + federatable: "可联合的", + public: "公开", + creator: "创建者", + join_rules: "加入规则", + guest_access: "访客访问", + history_visibility: "历史可见性", + }, + enums: { + join_rules: { + public: "公开", + knock: "申请", + invite: "邀请", + private: "私有", + }, + guest_access: { + can_join: "访客可以加入", + forbidden: "访客不可加入", + }, + history_visibility: { + invited: "自从被邀请", + joined: "自从加入", + shared: "自从分享", + world_readable: "任何人", + }, + unencrypted: "未加密", + }, + }, + reports: { + name: "报告事件", + fields: { + id: "ID", + received_ts: "报告时间", + user_id: "报告者", + name: "房间名", + score: "分数", + reason: "原因", + event_id: "事件 ID", + event_json: { + origin: "原始服务器", + origin_server_ts: "发送时间", + type: "事件类型", + content: { + msgtype: "内容类型", + body: "内容", + format: "格式", + formatted_body: "格式化的数据", + algorithm: "算法", + }, + }, + }, + }, + connections: { + name: "连接", + fields: { + last_seen: "日期", + ip: "IP 地址", + user_agent: "用户代理 (UA)", + }, + }, + devices: { + name: "设备", + fields: { + device_id: "设备 ID", + display_name: "设备名", + last_seen_ts: "时间戳", + last_seen_ip: "IP 地址", + }, + action: { + erase: { + title: "移除 %{id}", + content: '您确定要移除设备 "%{name}"?', + success: "设备移除成功。", + failure: "出现了一个错误。", + }, + }, + }, + users_media: { + name: "媒体文件", + fields: { + media_id: "媒体文件 ID", + media_length: "长度", + media_type: "类型", + upload_name: "文件名", + quarantined_by: "被隔离", + safe_from_quarantine: "取消隔离", + created_ts: "创建", + last_access_ts: "上一次访问", + }, + }, + delete_media: { + name: "媒体文件", + fields: { + before_ts: "最后访问时间", + size_gt: "大于 (字节)", + keep_profiles: "保留头像", + }, + action: { + send: "删除媒体", + send_success: "请求发送成功。", + send_failure: "出现了一个错误。", + }, + helper: { + send: + "这个API会删除您硬盘上的本地媒体。包含了任何的本地缓存和下载的媒体备份。这个API不会影响上传到外部媒体存储库上的媒体文件。", + }, + }, + pushers: { + name: "发布者", + fields: { + app: "App", + app_display_name: "App 名称", + app_id: "App ID", + device_display_name: "设备显示名", + kind: "类型", + lang: "语言", + profile_tag: "数据标签", + pushkey: "Pushkey", + data: { url: "URL" }, + }, + }, + servernotices: { + name: "服务器提示", + send: "发送服务器提示", + fields: { + body: "信息", + }, + action: { + send: "发送提示", + send_success: "服务器提示发送成功。", + send_failure: "出现了一个错误。", + }, + helper: { + send: + '向选中的用户发送服务器提示。服务器配置中的 "服务器提示(Server Notices)" 选项需要被设置为启用。', + }, + }, + user_media_statistics: { + name: "用户的媒体文件", + fields: { + media_count: "媒体文件统计", + media_length: "媒体文件长度", + }, + }, + }, +}; diff --git a/src/synapse/dataProvider.js b/src/synapse/dataProvider.js index 2dae5dc..b7cd5c2 100644 --- a/src/synapse/dataProvider.js +++ b/src/synapse/dataProvider.js @@ -117,6 +117,19 @@ const resourceMap = { return json.total; }, }, + room_state: { + map: rs => ({ + ...rs, + id: rs.event_id, + }), + reference: id => ({ + endpoint: `/_synapse/admin/v1/rooms/${id}/state`, + }), + data: "state", + total: json => { + return json.state.length; + }, + }, pushers: { map: p => ({ ...p, @@ -195,6 +208,30 @@ const resourceMap = { return json.total; }, }, + room_directory: { + path: "/_matrix/client/r0/publicRooms", + map: rd => ({ + ...rd, + id: rd.room_id, + public: !!rd.public, + guest_access: !!rd.guest_access, + avatar_src: mxcUrlToHttp(rd.avatar_url), + }), + data: "chunk", + total: json => { + return json.total_room_count_estimate; + }, + create: params => ({ + endpoint: `/_matrix/client/r0/directory/list/room/${params.id}`, + body: { visibility: "public" }, + method: "PUT", + }), + delete: params => ({ + endpoint: `/_matrix/client/r0/directory/list/room/${params.id}`, + body: { visibility: "private" }, + method: "PUT", + }), + }, }; function filterNullValues(key, value) { diff --git a/yarn.lock b/yarn.lock index 0ef9c8c..46ce125 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9378,6 +9378,11 @@ ra-i18n-polyglot@^3.14.4: node-polyglot "^2.2.2" ra-core "^3.14.4" +ra-language-chinese@^2.0.10: + version "2.0.10" + resolved "https://registry.yarnpkg.com/ra-language-chinese/-/ra-language-chinese-2.0.10.tgz#7c51b4d13cd6cf62cf8b4e945e489ac85bdc0e7f" + integrity sha512-k+X6XdkBEZnmpKIJZj9Lb77Lj8LCmterilJTj2ovp3i8/H/dLo9IujASfjFypjHnVUpN7Y63LT19kgPrS6+row== + ra-language-english@^3.14.4: version "3.14.4" resolved "https://registry.yarnpkg.com/ra-language-english/-/ra-language-english-3.14.4.tgz#ae8dd92a538f2e48f9329be0cd8d24a9e8a4a87d"