Skip to content

Commit

Permalink
Merge pull request #179 from assemblee-virtuelle/fix-TabbedForm
Browse files Browse the repository at this point in the history
[patch] (v2.0.0) Wrong display of TabbedForm component
  • Loading branch information
mguihal authored May 6, 2024
2 parents a2a8ba0 + 6502a0c commit bdb413a
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Edit from "../../../../layout/edit/Edit";

const ProjectEdit = props => (
<Edit redirect="show" {...props}>
<TabbedForm>
<TabbedForm syncWithLocation={false}>
<FormTab label="Données">
<TextInput source="pair:label" fullWidth />
<TextInput source="pair:comment" fullWidth />
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/resources/Agent/Activity/Task/TaskEdit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Edit from "../../../../layout/edit/Edit";

const TaskEdit = props => (
<Edit redirect="show" {...props}>
<TabbedForm>
<TabbedForm syncWithLocation={false}>
<FormTab label="Données">
<TextInput source="pair:label" fullWidth />
<MarkdownInput source="pair:description" fullWidth />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import ReificationArrayInput from '../../../../common/input/ReificationArrayInpu

export const OrganizationEdit = props => (
<Edit redirect="show" {...props}>
<TabbedForm>
<TabbedForm syncWithLocation={false}>
<TabbedForm.Tab label="Données">
<TextInput source="pair:label" fullWidth />
<TextInput source="pair:comment" fullWidth />
Expand Down Expand Up @@ -55,7 +55,7 @@ export const OrganizationEdit = props => (
<TabbedForm.Tab label="Relations">
<OrganizationsInput source="pair:partnerOf" />
<EventsInput source="pair:involvedIn" />
<DocumentsInput source="pair:documentedBy" />
<DocumentsInput source="pair:documentedBy" />
<CustomTreeSelectArrayInput source="pair:hasTopic" reference="Theme" label="A pour thème" broader="pair:broader" fullWidth />
</TabbedForm.Tab>
</TabbedForm>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/resources/Agent/Actor/Person/PersonEdit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const PersonEdit = props => (
transform={data => ({ ...data, 'pair:label': `${data['pair:firstName']} ${data['pair:lastName']?.toUpperCase()}` })}
{...props}
>
<TabbedForm>
<TabbedForm syncWithLocation={false}>
<FormTab label="Données">
<TextInput source="pair:firstName" fullWidth />
<TextInput source="pair:lastName" fullWidth />
Expand Down Expand Up @@ -49,4 +49,4 @@ export const PersonEdit = props => (
</Edit>
);

export default PersonEdit;
export default PersonEdit;
14 changes: 7 additions & 7 deletions frontend/src/resources/Concept/Theme/ThemeEdit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@ export const ThemeEdit = props => {

return (
<Edit redirect="show" {...props}>
<TabbedForm>
<TabbedForm syncWithLocation={false}>
<FormTab label="Données">
<TextInput source="pair:label" fullWidth />
<MarkdownInput source="pair:description" fullWidth />
</FormTab>
<FormTab label="Relations">
<AgentsInput source="pair:topicOf" />
<CustomTreeSelectInput
label="Thème Parent"
source="pair:broader"
reference="Theme"
broader="pair:broader"
<CustomTreeSelectInput
label="Thème Parent"
source="pair:broader"
reference="Theme"
broader="pair:broader"
validate={choices(validateIds, `La selection ne peut pas être l'élément courant`)}
fullWidth
fullWidth
/>
</FormTab>
</TabbedForm>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/resources/Object/Document/DocumentEdit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Edit from "../../../layout/edit/Edit";

export const DocumentEdit = props => (
<Edit redirect="show" {...props}>
<TabbedForm>
<TabbedForm syncWithLocation={false}>
<FormTab label="Données">
<TextInput source="pair:label" fullWidth />
<TextInput source="pair:comment" fullWidth />
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/resources/Resource/Skill/SkillEdit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { UsersInput, AgentsInput } from '../../../common/input';

export const SkillEdit = props => (
<Edit redirect="show" {...props}>
<TabbedForm>
<TabbedForm syncWithLocation={false}>
<FormTab label="Données">
<TextInput source="pair:label" fullWidth />
</FormTab>
Expand Down

0 comments on commit bdb413a

Please sign in to comment.