Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update master with development #30

Merged
merged 28 commits into from
Mar 4, 2024
Merged

Update master with development #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3681f56
Added tags excel and csv, updated pdf docdefinition
LorenzoJokhan Dec 20, 2022
5cb38f1
When it is not a pdf we want to save the whole tag, if it is a pdf ju…
LorenzoJokhan Dec 20, 2022
f7c78fb
preparedata use exceptionObjectKeys to skip tags, map id on update
LorenzoJokhan Dec 20, 2022
99cec14
Set forEach back
LorenzoJokhan Dec 20, 2022
50baee9
Simplified condition for tag exporting
LorenzoJokhan Dec 20, 2022
080c717
added flag to let the api know we used the import functionality for tags
LorenzoJokhan Dec 21, 2022
8bc475a
Removed useless minlength property
LorenzoJokhan Dec 21, 2022
4fd3f89
Changed body param name
LorenzoJokhan Jan 2, 2023
225fdd1
Remove the extra contextual vlag
LorenzoJokhan Jan 11, 2023
d938c72
Merge pull request #20 from openstad/import-tags-on-excel-and-csv
LorenzoJokhan Jan 16, 2023
df39fdf
Able to add, edit and view the tag type field
LorenzoJokhan Apr 13, 2023
aa54123
Merge pull request #22 from openstad/feature/manage-tag-type
LorenzoJokhan Apr 13, 2023
9417498
Merge branch 'master' into development
LorenzoJokhan Apr 20, 2023
3cf3e94
Added missing async disapeared fixing conflict
LorenzoJokhan Apr 20, 2023
3891bcc
async dissapeared on conflict resolution
LorenzoJokhan Apr 20, 2023
08da09f
Method dissapeared with conflict resolution
LorenzoJokhan Apr 20, 2023
30a7400
Updated react admin version
LorenzoJokhan Apr 20, 2023
f3d6181
Added required indication on tag create and edit
LorenzoJokhan May 15, 2023
780441c
Merge pull request #25 from openstad/bugfix/better-isRequired-indication
LorenzoJokhan Jun 12, 2023
4e32a42
Add budget field to idea in react admin beta
LorenzoJokhan Aug 28, 2023
3491b7d
Add field to change originalId in extradata
LorenzoJokhan Aug 28, 2023
60f082f
Merge pull request #27 from openstad/feature/add-field-to-idea-to-edi…
rudivanhierden Oct 5, 2023
111e0dd
Always set the publishDate to now when using the import button
LorenzoJokhan Dec 4, 2023
436f12d
Changed date now to new Date
LorenzoJokhan Dec 4, 2023
63b7878
Merge pull request #29 from openstad/bugfix/always-set-publishDate-wh…
LorenzoJokhan Dec 4, 2023
520240d
Merge branch 'master' into development
LorenzoJokhan Dec 4, 2023
b75d081
Merge branch 'development' into feature/use-budget-column-for-idea
LorenzoJokhan Mar 4, 2024
2f14c6d
Merge pull request #26 from openstad/feature/use-budget-column-for-idea
LorenzoJokhan Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
1 change: 1 addition & 0 deletions src/components/ImportButton/index.jsx
View file
Open in desktop
Original file line number Diff 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
2 changes: 2 additions & 0 deletions src/resources/idea/create-edit.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions src/resources/tag.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
);
Expand All @@ -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>
};
Loading