RA: Fix Flatpage edit (PATCH to /undefined) (#526)

* fix #513 - remove ID fields/inputs on Flatpage model * move base/flat-page -> cms/flat-page
ZdruzenieSTROM · Dec 14, 2024 · efe2c42 · efe2c42
1 parent 1d335f6
commit efe2c42
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/src/components/Admin/Admin.tsx b/src/components/Admin/Admin.tsx
@@ -5,10 +5,10 @@ import {Admin as ReactAdmin, defaultDarkTheme, defaultLightTheme, RaThemeOptions
 import {AdminLayout} from './AdminLayout'
 import {dataProvider} from './dataProvider'
 import {myI18nProvider} from './i18nProvider'
-import {FlatpageCreate} from './resources/base/flat-page/FlatpageCreate'
-import {FlatpageEdit} from './resources/base/flat-page/FlatpageEdit'
-import {FlatpageList} from './resources/base/flat-page/FlatpageList'
-import {FlatpageShow} from './resources/base/flat-page/FlatpageShow'
+import {FlatpageCreate} from './resources/cms/flat-page/FlatpageCreate'
+import {FlatpageEdit} from './resources/cms/flat-page/FlatpageEdit'
+import {FlatpageList} from './resources/cms/flat-page/FlatpageList'
+import {FlatpageShow} from './resources/cms/flat-page/FlatpageShow'
 import {PostCreate} from './resources/cms/post/PostCreate'
 import {PostEdit} from './resources/cms/post/PostEdit'
 import {PostList} from './resources/cms/post/PostList'

diff --git a/...sources/base/flat-page/FlatpageCreate.tsx → ...esources/cms/flat-page/FlatpageCreate.tsx b/...sources/base/flat-page/FlatpageCreate.tsx → ...esources/cms/flat-page/FlatpageCreate.tsx
@@ -1,5 +1,5 @@
 import {FC} from 'react'
-import {FormTab, NumberInput, required, TabbedForm, TextInput} from 'react-admin'
+import {FormTab, required, TabbedForm, TextInput} from 'react-admin'
 
 import {FlatpagePreview} from '@/components/Admin/custom/FlatpagePreview'
 import {MyCreate} from '@/components/Admin/custom/MyCreate'
@@ -8,7 +8,6 @@ export const FlatpageCreate: FC = () => (
   <MyCreate>
     <TabbedForm>
       <FormTab label="content.labels.general">
-        <NumberInput source="id" fullWidth disabled />
         <TextInput source="url" fullWidth validate={required()} />
         <TextInput source="title" fullWidth validate={required()} />
         <TextInput source="content" multiline fullWidth validate={required()} />

diff --git a/...resources/base/flat-page/FlatpageEdit.tsx → .../resources/cms/flat-page/FlatpageEdit.tsx b/...resources/base/flat-page/FlatpageEdit.tsx → .../resources/cms/flat-page/FlatpageEdit.tsx
@@ -1,5 +1,5 @@
 import {FC} from 'react'
-import {FormTab, NumberInput, required, TabbedForm, TextInput} from 'react-admin'
+import {FormTab, required, TabbedForm, TextInput} from 'react-admin'
 
 import {FlatpagePreview} from '@/components/Admin/custom/FlatpagePreview'
 import {MyEdit} from '@/components/Admin/custom/MyEdit'
@@ -8,7 +8,6 @@ export const FlatpageEdit: FC = () => (
   <MyEdit>
     <TabbedForm>
       <FormTab label="content.labels.general">
-        <NumberInput source="id" fullWidth disabled />
         <TextInput source="url" fullWidth validate={required()} />
         <TextInput source="title" fullWidth validate={required()} />
         <TextInput source="content" multiline fullWidth validate={required()} />

diff --git a/...resources/base/flat-page/FlatpageList.tsx → .../resources/cms/flat-page/FlatpageList.tsx b/...resources/base/flat-page/FlatpageList.tsx → .../resources/cms/flat-page/FlatpageList.tsx
@@ -1,12 +1,11 @@
 import {FC} from 'react'
-import {Datagrid, List, NumberField, TextField} from 'react-admin'
+import {Datagrid, List, TextField} from 'react-admin'
 
 import {TruncatedTextField} from '@/components/Admin/custom/TruncatedTextField'
 
 export const FlatpageList: FC = () => (
   <List>
     <Datagrid>
-      <NumberField source="id" />
       <TextField source="url" />
       <TextField source="title" />
       <TruncatedTextField source="content" maxTextWidth={30} />

diff --git a/...resources/base/flat-page/FlatpageShow.tsx → .../resources/cms/flat-page/FlatpageShow.tsx b/...resources/base/flat-page/FlatpageShow.tsx → .../resources/cms/flat-page/FlatpageShow.tsx
@@ -1,13 +1,12 @@
 import {FC} from 'react'
-import {NumberField, Show, SimpleShowLayout, TextField} from 'react-admin'
+import {Show, SimpleShowLayout, TextField} from 'react-admin'
 
 import {MyShowActions} from '@/components/Admin/custom/MyShowActions'
 import {TruncatedTextField} from '@/components/Admin/custom/TruncatedTextField'
 
 export const FlatpageShow: FC = () => (
   <Show actions={<MyShowActions />}>
     <SimpleShowLayout>
-      <NumberField source="id" />
       <TextField source="url" />
       <TextField source="title" />
       <TruncatedTextField source="content" maxTextWidth={200} expandable />