remove props

src/components/EventReports.js

@@ -28,10 +28,10 @@ const ReportPagination = props => (
   <Pagination {...props} rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />
 );
 
-export const ReportShow = props => {
+export const ReportShow = () => {
   const translate = useTranslate();
   return (
-    <Show {...props}>
+    <Show>
       <TabbedShowLayout>
         <Tab
           label={translate("synapseadmin.reports.tabs.basic", {
@@ -97,10 +97,8 @@ export const ReportShow = props => {
   );
 };
 
-export const ReportList = ({ ...props }) => {
+export const ReportList = () => (
-  return (
   <List
-      {...props}
     pagination={<ReportPagination />}
     sort={{ field: "received_ts", order: "DESC" }}
     bulkActionButtons={false}
@@ -118,5 +116,4 @@ export const ReportList = ({ ...props }) => {
       <TextField sortable={false} source="score" />
     </Datagrid>
   </List>
-  );
+);
-};

src/components/Menu.js

@@ -1,4 +1,3 @@
-// in src/Menu.js
 import * as React from "react";
 import { useMediaQuery } from "@mui/material";
 import {

src/components/RegistrationTokens.js

@@ -59,10 +59,8 @@ const RegistrationTokenFilter = props => (
   </Filter>
 );
 
-export const RegistrationTokenList = props => {
+export const RegistrationTokenList = () => (
-  return (
   <List
-      {...props}
     filters={<RegistrationTokenFilter />}
     filterDefaultValues={{ valid: true }}
     pagination={false}
@@ -81,11 +79,10 @@ export const RegistrationTokenList = props => {
       />
     </Datagrid>
   </List>
-  );
+);
-};
 
-export const RegistrationTokenCreate = props => (
+export const RegistrationTokenCreate = () => (
-  <Create {...props}>
+  <Create>
     <SimpleForm redirect="list" toolbar={<Toolbar alwaysEnableSaveButton />}>
       <TextInput
         source="token"
@@ -109,9 +106,8 @@ export const RegistrationTokenCreate = props => (
   </Create>
 );
 
-export const RegistrationTokenEdit = props => {
+export const RegistrationTokenEdit = () => (
-  return (
+  <Edit>
-    <Edit {...props}>
     <SimpleForm>
       <TextInput source="token" disabled />
       <NumberInput source="pending" disabled />
@@ -128,5 +124,4 @@ export const RegistrationTokenEdit = props => {
       />
     </SimpleForm>
   </Edit>
-  );
+);
-};

src/components/RoomDirectory.js

@@ -28,12 +28,11 @@ const RoomDirectoryPagination = props => (
   <Pagination {...props} rowsPerPageOptions={[100, 500, 1000, 2000]} />
 );
 
-export const RoomDirectoryDeleteButton = props => {
+export const RoomDirectoryDeleteButton = () => {
   const translate = useTranslate();
 
   return (
     <DeleteButton
-      {...props}
       label="resources.room_directory.action.erase"
       redirect={false}
       mutationMode="pessimistic"
@@ -49,9 +48,8 @@ export const RoomDirectoryDeleteButton = props => {
   );
 };
 
-export const RoomDirectoryBulkDeleteButton = props => (
+export const RoomDirectoryBulkDeleteButton = () => (
   <BulkDeleteButton
-    {...props}
     label="resources.room_directory.action.erase"
     mutationMode="pessimistic"
     confirmTitle="resources.room_directory.action.title"
@@ -100,13 +98,12 @@ export const RoomDirectorySaveButton = () => {
   const record = useRecordContext();
   const notify = useNotify();
   const refresh = useRefresh();
-  const [create, { isloading }] = useCreate("room_directory");
+  const [create, { isloading }] = useCreate();
 
   const handleSend = values => {
     create(
-      {
+      "room_directory",
-        payload: { data: { id: record.id } },
+      { data: { id: record.id } },
-      },
       {
         onSuccess: data => {
           notify("resources.room_directory.action.send_success");
@@ -137,9 +134,10 @@ const RoomDirectoryBulkActionButtons = () => (
   </Fragment>
 );
 
-const AvatarField = ({ source, className, record = {} }) => (
+const AvatarField = ({ source, sx }) => {
-  <Avatar src={record[source]} className={className} />
+  const record = useRecordContext();
-);
+  return <Avatar src={record[source]} sx={sx} />;
+};
 
 const RoomDirectoryListActions = () => (
   <TopToolbar>

src/components/destinations.js

@@ -128,14 +128,10 @@ export const DestinationList = () => {
   );
 };
 
-export const DestinationShow = props => {
+export const DestinationShow = () => {
   const translate = useTranslate();
   return (
-    <Show
+    <Show actions={<DestinationShowActions />} title={<DestinationTitle />}>
-      actions={<DestinationShowActions />}
-      title={<DestinationTitle />}
-      {...props}
-    >
       <TabbedShowLayout>
         <Tab label="status" icon={<ViewListIcon />}>
           <TextField source="destination" />

src/components/rooms.js

@@ -55,7 +55,7 @@ const RoomPagination = props => (
   <Pagination {...props} rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />
 );
 
-const RoomTitle = props => {
+const RoomTitle = () => {
   const record = useRecordContext();
   const translate = useTranslate();
   var name = "";
@@ -70,23 +70,23 @@ const RoomTitle = props => {
   );
 };
 
-const RoomShowActions = ({ data, resource }) => {
+const RoomShowActions = () => {
+  const record = useRecordContext();
   var roomDirectoryStatus = "";
-  if (data) {
+  if (record) {
-    roomDirectoryStatus = data.public;
+    roomDirectoryStatus = record.public;
   }
 
   return (
     <TopToolbar>
       {roomDirectoryStatus === false && (
-        <RoomDirectorySaveButton record={data} />
+        <RoomDirectorySaveButton record={record} />
       )}
       {roomDirectoryStatus === true && (
-        <RoomDirectoryDeleteButton record={data} />
+        <RoomDirectoryDeleteButton record={record} />
       )}
       <DeleteButton
-        record={data}
+        record={record}
-        resource={resource}
         mutationMode="pessimistic"
         confirmTitle="resources.rooms.action.erase.title"
         confirmContent="resources.rooms.action.erase.content"
@@ -95,10 +95,10 @@ const RoomShowActions = ({ data, resource }) => {
   );
 };
 
-export const RoomShow = props => {
+export const RoomShow = () => {
   const translate = useTranslate();
   return (
-    <Show {...props} actions={<RoomShowActions />} title={<RoomTitle />}>
+    <Show actions={<RoomShowActions />} title={<RoomTitle />}>
       <TabbedShowLayout>
         <Tab label="synapseadmin.rooms.tabs.basic" icon={<ViewListIcon />}>
           <TextField source="room_id" />
@@ -348,7 +348,6 @@ export const RoomList = () => {
             [`& [data-testid="false"]`]: { color: theme.palette.error.main },
           }}
         />
-
         <RoomNameField source="name" />
         <TextField source="joined_members" />
         <TextField source="joined_local_members" />

src/components/statistics.js

@@ -57,10 +57,8 @@ const UserMediaStatsFilter = props => (
   </Filter>
 );
 
-export const UserMediaStatsList = props => {
+export const UserMediaStatsList = () => (
-  return (
   <List
-      {...props}
     actions={<ListActions />}
     filters={<UserMediaStatsFilter />}
     pagination={<UserMediaStatsPagination />}
@@ -79,5 +77,4 @@ export const UserMediaStatsList = props => {
       <NumberField source="media_length" />
     </Datagrid>
   </List>
-  );
+);
-};

src/components/users.js

@@ -148,14 +148,13 @@ const UserBulkActionButtons = () => (
   </>
 );
 
-const AvatarField = ({ source, record = {}, sx }) => (
+const AvatarField = ({ source, sx }) => {
-  <Avatar src={record[source]} sx={sx} />
+  const record = useRecordContext();
-);
+  return <Avatar src={record[source]} sx={sx} />;
+};
 
-export const UserList = props => {
+export const UserList = () => (
-  return (
   <List
-      {...props}
     filters={<UserFilter />}
     filterDefaultValues={{ guests: true, deactivated: false }}
     sort={{ field: "name", order: "ASC" }}
@@ -181,8 +180,7 @@ export const UserList = props => {
       />
     </Datagrid>
   </List>
-  );
+);
-};
 
 // https://matrix.org/docs/spec/appendices#user-identifiers
 // here only local part of user_id
@@ -265,8 +263,8 @@ const UserEditActions = ({ data }) => {
   );
 };
 
-export const UserCreate = props => (
+export const UserCreate = () => (
-  <Create {...props}>
+  <Create>
     <SimpleForm>
       <TextInput source="id" autoComplete="off" validate={validateUser} />
       <TextInput source="displayname" validate={maxLength(256)} />
@@ -306,7 +304,7 @@ export const UserCreate = props => (
   </Create>
 );
 
-const UserTitle = props => {
+const UserTitle = () => {
   const record = useRecordContext();
   const translate = useTranslate();
   return (
@@ -319,10 +317,10 @@ const UserTitle = props => {
   );
 };
 
-export const UserEdit = props => {
+export const UserEdit = () => {
   const translate = useTranslate();
   return (
-    <Edit {...props} title={<UserTitle />} actions={<UserEditActions />}>
+    <Edit title={<UserTitle />} actions={<UserEditActions />}>
       <TabbedForm toolbar={<UserEditToolbar />}>
         <FormTab
           label={translate("resources.users.name", { smart_count: 1 })}