From 4cefcae986aa2b0358c247dfba681c5cfabf0324 Mon Sep 17 00:00:00 2001 From: dklimpel <5740567+dklimpel@users.noreply.github.com> Date: Thu, 3 Feb 2022 17:00:34 +0100 Subject: [PATCH] replace `({ record })` with `useRecordContext()` --- src/components/RoomDirectory.js | 4 +++- src/components/ServerNotices.js | 4 +++- src/components/devices.js | 3 ++- src/components/media.js | 5 +++-- src/components/rooms.js | 5 +++-- src/components/users.js | 4 +++- 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/components/RoomDirectory.js b/src/components/RoomDirectory.js index 0284e14..661e8b5 100644 --- a/src/components/RoomDirectory.js +++ b/src/components/RoomDirectory.js @@ -19,6 +19,7 @@ import { useMutation, useNotify, useTranslate, + useRecordContext, useRefresh, useUnselectAll, } from "react-admin"; @@ -103,7 +104,8 @@ export const RoomDirectoryBulkSaveButton = ({ selectedIds }) => { ); }; -export const RoomDirectorySaveButton = ({ record }) => { +export const RoomDirectorySaveButton = props => { + const record = useRecordContext(); const notify = useNotify(); const refresh = useRefresh(); const [create, { loading }] = useCreate("room_directory"); diff --git a/src/components/ServerNotices.js b/src/components/ServerNotices.js index 6b9b95c..5d63c94 100644 --- a/src/components/ServerNotices.js +++ b/src/components/ServerNotices.js @@ -9,6 +9,7 @@ import { useCreate, useMutation, useNotify, + useRecordContext, useTranslate, useUnselectAll, } from "react-admin"; @@ -64,7 +65,8 @@ const ServerNoticeDialog = ({ open, loading, onClose, onSend }) => { ); }; -export const ServerNoticeButton = ({ record }) => { +export const ServerNoticeButton = props => { + const record = useRecordContext(); const [open, setOpen] = useState(false); const notify = useNotify(); const [create, { loading }] = useCreate("servernotices"); diff --git a/src/components/devices.js b/src/components/devices.js index ee9292c..e2fb7d1 100644 --- a/src/components/devices.js +++ b/src/components/devices.js @@ -4,6 +4,7 @@ import { useMutation, useNotify, Confirm, + useRecordContext, useRefresh, } from "react-admin"; import ActionDelete from "@material-ui/icons/Delete"; @@ -28,7 +29,7 @@ const useStyles = makeStyles( ); export const DeviceRemoveButton = props => { - const { record } = props; + const record = useRecordContext(); const classes = useStyles(props); const [open, setOpen] = useState(false); const refresh = useRefresh(); diff --git a/src/components/media.js b/src/components/media.js index a523fa2..6d8715e 100644 --- a/src/components/media.js +++ b/src/components/media.js @@ -14,6 +14,7 @@ import { useCreate, useDelete, useNotify, + useRecordContext, useRefresh, useTranslate, } from "react-admin"; @@ -152,7 +153,7 @@ export const DeleteMediaButton = props => { }; export const ProtectMediaButton = props => { - const { record } = props; + const record = useRecordContext(); const translate = useTranslate(); const refresh = useRefresh(); const notify = useNotify(); @@ -244,7 +245,7 @@ export const ProtectMediaButton = props => { }; export const QuarantineMediaButton = props => { - const { record } = props; + const record = useRecordContext(); const translate = useTranslate(); const refresh = useRefresh(); const notify = useNotify(); diff --git a/src/components/rooms.js b/src/components/rooms.js index fa01c77..6a3bf36 100644 --- a/src/components/rooms.js +++ b/src/components/rooms.js @@ -78,7 +78,8 @@ const EncryptionField = ({ source, record = {}, emptyText }) => { ); }; -const RoomTitle = ({ record }) => { +const RoomTitle = props => { + const record = useRecordContext(); const translate = useTranslate(); var name = ""; if (record) { @@ -355,7 +356,7 @@ const RoomFilter = ({ ...props }) => { const RoomNameField = props => { const { source } = props; - const record = useRecordContext(props); + const record = useRecordContext(); return ( {record[source] || record["canonical_alias"] || record["id"]} ); diff --git a/src/components/users.js b/src/components/users.js index 83694f9..f3c2ab9 100644 --- a/src/components/users.js +++ b/src/components/users.js @@ -39,6 +39,7 @@ import { maxLength, regex, required, + useRecordContext, useTranslate, Pagination, CreateButton, @@ -302,7 +303,8 @@ export const UserCreate = props => ( ); -const UserTitle = ({ record }) => { +const UserTitle = props => { + const record = useRecordContext(); const translate = useTranslate(); return (