From b68243afda9a25ea17a5b722efdbc55fa0f5f7d1 Mon Sep 17 00:00:00 2001 From: Florent Chehab Date: Fri, 1 Mar 2019 11:33:38 +0100 Subject: [PATCH] Restored University Dri and fixes accross the board --- .../university/editors/UniversityDriEditor.js | 19 ++++++++++++++++--- .../university/modules/UniversityDri.js | 13 ++++++------- .../src/components/university/shared/Form.js | 1 + .../university/shared/GenericGroupModule.js | 12 ++++++------ .../university/shared/GenericModule.js | 2 +- .../components/university/shared/Module.js | 2 -- 6 files changed, 30 insertions(+), 19 deletions(-) diff --git a/frontend/src/components/university/editors/UniversityDriEditor.js b/frontend/src/components/university/editors/UniversityDriEditor.js index 3d81b7f5..ae80790c 100644 --- a/frontend/src/components/university/editors/UniversityDriEditor.js +++ b/frontend/src/components/university/editors/UniversityDriEditor.js @@ -5,18 +5,19 @@ import compose from "recompose/compose"; import { connect } from "react-redux"; import Editor from "../shared/Editor"; +import Form from "../shared/Form"; import editorStyle from "../shared/editorStyle"; import getMapStateToPropsForEditor from "../shared/editorFunctions/getMapStateToPropsForEditor"; import getMapDispatchToPropsForEditor from "../shared/editorFunctions/getMapDispatchToPropsForEditor"; +import { withSnackbar } from "notistack"; const styles = theme => ({ ...editorStyle(theme) }); -class UniversityDriEditor extends Editor { - - renderEditor() { +class UniversityDriForm extends Form { + render() { return (
{this.renderTitleField()} @@ -29,12 +30,24 @@ class UniversityDriEditor extends Editor { } } +class UniversityDriEditor extends Editor { + + renderForm() { + return ; + } +} + UniversityDriEditor.propTypes = { modelData: PropTypes.object.isRequired, }; export default compose( + withSnackbar, withStyles(styles, { withTheme: true }), connect( getMapStateToPropsForEditor("universityDri"), diff --git a/frontend/src/components/university/modules/UniversityDri.js b/frontend/src/components/university/modules/UniversityDri.js index 7b242c64..d1622d1c 100644 --- a/frontend/src/components/university/modules/UniversityDri.js +++ b/frontend/src/components/university/modules/UniversityDri.js @@ -50,13 +50,12 @@ function parseRawModelData(rawModelData) { class UniversityDri extends Module { + customRender() { - const univDriItems = this.getReadData("universityDri"); - const { universities, classes } = this.props; + const { universities, classes } = this.props, + outsideData = { universities }; - const outsideData = { - universities - }; + const univDriItems = this.getReadData("universityDri"); return ( { - univDriItems.map((rawModelData, idx) => ( + univDriItems.map(rawModelData => ( modelData.title} rawModelData={rawModelData} parseRawModelData={parseRawModelData} diff --git a/frontend/src/components/university/shared/Form.js b/frontend/src/components/university/shared/Form.js index c16e15b4..b528ded1 100644 --- a/frontend/src/components/university/shared/Form.js +++ b/frontend/src/components/university/shared/Form.js @@ -160,6 +160,7 @@ Object.assign(Form.prototype, renderFieldsMixIn); Form.propTypes = { modelData: PropTypes.object.isRequired, + outsideData: PropTypes.object, }; export default Form; diff --git a/frontend/src/components/university/shared/GenericGroupModule.js b/frontend/src/components/university/shared/GenericGroupModule.js index 09e42bfc..48ee0eb0 100644 --- a/frontend/src/components/university/shared/GenericGroupModule.js +++ b/frontend/src/components/university/shared/GenericGroupModule.js @@ -56,7 +56,7 @@ class GenericGroupModule extends CustomComponentForAPI { this.setState({ editorOpen: true }); } - handleCloseEditor = (somethingWasSaved = false) => { + handleEditorWasClosed = (somethingWasSaved = false) => { this.setState({ editorOpen: false }); if (somethingWasSaved) { this.props.invalidateGroup(); @@ -64,16 +64,16 @@ class GenericGroupModule extends CustomComponentForAPI { }; customRender() { - const { classes, groupTitle } = this.props; - const { endPoint } = this.props; - const userCanPostTo = this.getReadData("userData").owner_can_post_to; - const disabled = userCanPostTo.indexOf(endPoint) < 0; + const { classes, groupTitle, endPoint } = this.props, + userCanPostTo = this.getReadData("userData").owner_can_post_to, + disabled = userCanPostTo.indexOf(endPoint) < 0; + return ( diff --git a/frontend/src/components/university/shared/GenericModule.js b/frontend/src/components/university/shared/GenericModule.js index 3c8789fa..3ba11671 100644 --- a/frontend/src/components/university/shared/GenericModule.js +++ b/frontend/src/components/university/shared/GenericModule.js @@ -68,7 +68,7 @@ class GenericModule extends CustomComponentForAPI { handleEditorWasClosed = (somethingWasSaved = false) => { this.setState({ editorOpen: false, dataToSave: null }); if (somethingWasSaved && this.props.moduleInGroupInfos.isInGroup) { - // this.props.moduleInGroupInfos.invalidateGroup(); + this.props.moduleInGroupInfos.invalidateGroup(); } }; diff --git a/frontend/src/components/university/shared/Module.js b/frontend/src/components/university/shared/Module.js index 72a639c3..d589ae97 100644 --- a/frontend/src/components/university/shared/Module.js +++ b/frontend/src/components/university/shared/Module.js @@ -7,8 +7,6 @@ import CustomComponentForAPI from "../../CustomComponentForAPI"; * @extends React.Component */ class Module extends CustomComponentForAPI { - // prevent hard reset of module when refetching - // ignoreInvalidation = true; componentWillUnmount() { this.props.invalidateData(true); -- 2.22.0