Merge pull request #30 from openstad/development

Update master with development
openstad · Mar 4, 2024 · 16be70a · 16be70a
2 parents 9f0291c + 2f14c6d
commit 16be70a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "openstad-react-admin",
   "homepage": "https://github.com/Amsterdam/openstad-react-admin",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "private": false,
   "publishConfig": {
     "access": "public"

diff --git a/src/components/ImportButton/index.jsx b/src/components/ImportButton/index.jsx
@@ -134,6 +134,7 @@ export const ImportButton = (props) => {
     }
 
     cleanUp(value, null)
+    value['publishDate'] = new Date();
     return value;
   }
 

diff --git a/src/resources/idea/create-edit.jsx b/src/resources/idea/create-edit.jsx
@@ -61,6 +61,8 @@ const Form = (props) => (
       <TextInput source="title" variant="outlined" fullWidth/>
       <TextInput source="summary" options={{ multiLine: true }} variant="outlined" fullWidth validate={[required()]} />
       <TextInput multiline source="description" variant="outlined" fullWidth validate={[required()]}/>
+      <TextInput source="budget" variant="outlined" fullWidth/>
+      <TextInput placeholder='The id of the original idea' label="Original idea-id" source="extraData.originalId" variant="outlined" fullWidth/>
       <ReferenceArrayInput label="tags" source="tags" reference="tag" variant="outlined">
         <SelectArrayInput optionText="name"/>
       </ReferenceArrayInput>

diff --git a/src/resources/tag.jsx b/src/resources/tag.jsx
@@ -55,8 +55,8 @@ const TagTitle = ({ record }) => {
 export const TagEdit = (props) => (
     <Edit mutationMode="pessimistic" title={<TagTitle />} {...props}>
         <SimpleForm>
-          <TextInput source="name" label="Tag name" variant="outlined" />
-          <TextInput source="type" required="false" label="Tag type" variant="outlined" />
+          <TextInput isRequired={true} source="name" label="Tag name" variant="outlined" />
+          <TextInput isRequired={false} source="type" label="Tag type" variant="outlined" />
         </SimpleForm>
     </Edit>
 );
@@ -72,8 +72,8 @@ export const TagCreate = (props) => {
       refresh()
   }}>
         <SimpleForm>
-          <TextInput source="name" label="Tag name" variant="outlined" />
-          <TextInput source="type" required="false" label="Tag type" variant="outlined" />
+          <TextInput isRequired={true} source="name" label="Tag name" variant="outlined" />
+          <TextInput isRequired={false} source="type" label="Tag type" variant="outlined" />
         </SimpleForm>
     </Create>
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -134,6 +134,7 @@ export const ImportButton = (props) => { @@
         }
         cleanUp(value, null)
+        value['publishDate'] = new Date();
         return value;
       }
@@ Expand Down @@