diff --git a/frontend/src/components/university/editors/UniversityDriEditor.js b/frontend/src/components/university/editors/UniversityDriEditor.js
index 3d81b7f51a292a34f565ecc7240b54067e4d3cc6..ae80790c8e640e67f5006a043ead2ec196fd87ba 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 7b242c6422a6d637e319fefae84ed0a3c4570a70..d1622d1c79876d5827fc4620cc4351bf5887258b 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 c16e15b48a795061f4e41eec673c6e2e1cb4a2d5..b528ded130df30786eac08f9287a4ca4c7e9bc51 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 09e42bfc0661c62d399db99ec14baac595c3b66d..48ee0eb0fce145fd2eefc096b3f93ef98948df54 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 3c8789fa83d203d20148bdc084424988e9325e09..3ba116719cb0cb91f852efb910473dca48ac2bb9 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 72a639c3c1f79825fc65f0b4e824dd8410d4d5f3..d589ae9741500373d678822940bb7ca36b8f4fad 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);