From 74f77e6988a78d768ec1b9e07d67bd8988b02b02 Mon Sep 17 00:00:00 2001
From: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com>
Date: Tue, 24 Jan 2023 16:36:08 +0100
Subject: [PATCH] Replace `({ record })` with `useRecordContext()` (#236)
* replace `({ record })` with `useRecordContext()`
* code style
Co-authored-by: Michael Albert <37796947+awesome-michael@users.noreply.github.com>
---
src/components/RoomDirectory.js | 4 +++-
src/components/ServerNotices.js | 4 +++-
src/components/devices.js | 11 +++++++++--
src/components/media.js | 5 +++--
src/components/rooms.js | 5 +++--
src/components/users.js | 4 +++-
6 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/src/components/RoomDirectory.js b/src/components/RoomDirectory.js
index 5a9487f..feb5e71 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";
@@ -105,7 +106,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 a8e186e..1117321 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 b4cb701..7e24dff 100644
--- a/src/components/devices.js
+++ b/src/components/devices.js
@@ -1,5 +1,12 @@
import React, { Fragment, useState } from "react";
-import { Button, useDelete, useNotify, Confirm, useRefresh } from "react-admin";
+import {
+ Button,
+ useDelete,
+ useNotify,
+ Confirm,
+ useRecordContext,
+ useRefresh,
+} from "react-admin";
import ActionDelete from "@material-ui/icons/Delete";
import { makeStyles } from "@material-ui/core/styles";
import { alpha } from "@material-ui/core/styles/colorManipulator";
@@ -22,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 aed1ee8..66340eb 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";
@@ -154,7 +155,7 @@ export const DeleteMediaButton = props => {
};
export const ProtectMediaButton = props => {
- const { record } = props;
+ const record = useRecordContext();
const translate = useTranslate();
const refresh = useRefresh();
const notify = useNotify();
@@ -250,7 +251,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 6417221..276d3d4 100644
--- a/src/components/rooms.js
+++ b/src/components/rooms.js
@@ -87,7 +87,8 @@ const EncryptionField = ({ source, record = {}, emptyText }) => {
);
};
-const RoomTitle = ({ record }) => {
+const RoomTitle = props => {
+ const record = useRecordContext();
const translate = useTranslate();
var name = "";
if (record) {
@@ -354,7 +355,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 198c6c1..3759705 100644
--- a/src/components/users.js
+++ b/src/components/users.js
@@ -39,6 +39,7 @@ import {
maxLength,
regex,
required,
+ useRecordContext,
useTranslate,
Pagination,
CreateButton,
@@ -329,7 +330,8 @@ export const UserCreate = props => (
);
-const UserTitle = ({ record }) => {
+const UserTitle = props => {
+ const record = useRecordContext();
const translate = useTranslate();
return (