Commit 8a0c601c authored by Florent Chehab's avatar Florent Chehab
Browse files

Reorganized js files and bug corrected in Generic Module

parent 9ea9cf99
Pipeline #27327 passed with stages
in 2 minutes and 48 seconds
...@@ -4,18 +4,18 @@ import withStyles from '@material-ui/core/styles/withStyles'; ...@@ -4,18 +4,18 @@ import withStyles from '@material-ui/core/styles/withStyles';
import compose from 'recompose/compose'; import compose from 'recompose/compose';
import { connect } from "react-redux"; import { connect } from "react-redux";
import Editor from './Editor'; import Editor from '../shared/Editor';
import editorStyle from './editorStyle'; import editorStyle from '../shared/editorStyle';
import DateField from './fields/DateField'; import DateField from '../shared/fields/DateField';
import UsefulLinksField from './fields/UsefulLinksField'; import UsefulLinksField from '../shared/fields/UsefulLinksField';
import MarkdownField from './fields/MarkdownField'; import MarkdownField from '../shared/fields/MarkdownField';
import dateStrToDate from '../../../../utils/dateStrToDate'; import dateStrToDate from '../../../utils/dateStrToDate';
import { import {
universitiesSemestersDatesElSaveData, universitiesSemestersDatesElSaveData,
universitiesSemestersDatesElSavingHasError universitiesSemestersDatesElSavingHasError
} from '../../../../generated/actions'; } from '../../../generated/actions';
const styles = theme => ({ const styles = theme => ({
...editorStyle(theme) ...editorStyle(theme)
......
...@@ -18,7 +18,7 @@ import PersonIcon from '@material-ui/icons/Person'; ...@@ -18,7 +18,7 @@ import PersonIcon from '@material-ui/icons/Person';
import MyComponent from '../../MyComponent'; import MyComponent from '../../MyComponent';
import TextLink from '../../other/TextLink'; import TextLink from '../../other/TextLink';
import GenericModule from './GenericModule'; import GenericModule from '../shared/GenericModule';
import Grid from '@material-ui/core/Grid'; import Grid from '@material-ui/core/Grid';
import Divider from '@material-ui/core/Divider'; import Divider from '@material-ui/core/Divider';
......
...@@ -2,9 +2,9 @@ import React from 'react'; ...@@ -2,9 +2,9 @@ import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import withStyles from '@material-ui/core/styles/withStyles'; import withStyles from '@material-ui/core/styles/withStyles';
import Paper from '@material-ui/core/Paper'; import Paper from '@material-ui/core/Paper';
import GenericModule from './GenericModule'; import GenericModule from '../shared/GenericModule';
import GenericGroupModule from './GenericGroupModule'; import GenericGroupModule from '../shared/GenericGroupModule';
const styles = theme => ({ const styles = theme => ({
......
...@@ -6,7 +6,7 @@ import PhotoIcon from '@material-ui/icons/Photo'; ...@@ -6,7 +6,7 @@ import PhotoIcon from '@material-ui/icons/Photo';
import MyComponent from '../../MyComponent'; import MyComponent from '../../MyComponent';
import TextLink from '../../other/TextLink'; import TextLink from '../../other/TextLink';
import GenericModule from './GenericModule'; import GenericModule from '../shared/GenericModule';
import Grid from '@material-ui/core/Grid'; import Grid from '@material-ui/core/Grid';
import Divider from '@material-ui/core/Divider'; import Divider from '@material-ui/core/Divider';
......
...@@ -15,13 +15,13 @@ import Markdown from '../../shared/Markdown'; ...@@ -15,13 +15,13 @@ import Markdown from '../../shared/Markdown';
import CloudQueueIcon from '@material-ui/icons/CloudQueue'; import CloudQueueIcon from '@material-ui/icons/CloudQueue';
import LocalFloristIcon from '@material-ui/icons/LocalFlorist'; import LocalFloristIcon from '@material-ui/icons/LocalFlorist';
import GenericModule from './GenericModule'; import GenericModule from '../shared/GenericModule';
import MyComponent from '../../MyComponent'; import MyComponent from '../../MyComponent';
import dateStrToStr from '../../../utils/dateStrToStr'; import dateStrToStr from '../../../utils/dateStrToStr';
import UniversitySemestersDatesEditor from './editors/UniversitySemestersDatesEditor'; import UniversitySemestersDatesEditor from '../editors/UniversitySemestersDatesEditor';
import { import {
universitiesSemestersDatesElFetchData, universitiesSemestersDatesElFetchData,
......
...@@ -10,10 +10,10 @@ import Typography from '@material-ui/core/Typography'; ...@@ -10,10 +10,10 @@ import Typography from '@material-ui/core/Typography';
import CloseIcon from '@material-ui/icons/Close'; import CloseIcon from '@material-ui/icons/Close';
import Slide from '@material-ui/core/Slide'; import Slide from '@material-ui/core/Slide';
import MyComponent from '../../../MyComponent'; import MyComponent from '../../MyComponent';
import Alert from './Alert'; import Alert from './Alert';
import Notification from './Notification'; import Notification from './Notification';
import getObjModerationLevel from '../../../../utils/getObjModerationLevels'; import getObjModerationLevel from '../../../utils/getObjModerationLevels';
import SelectField from './fields/SelectField'; import SelectField from './fields/SelectField';
function Transition(props) { function Transition(props) {
......
...@@ -12,7 +12,7 @@ import green from '@material-ui/core/colors/green'; ...@@ -12,7 +12,7 @@ import green from '@material-ui/core/colors/green';
import MyComponent from '../../MyComponent'; import MyComponent from '../../MyComponent';
import isModerationRequired from '../../../utils/isModerationRequired'; import isModerationRequired from '../../../utils/isModerationRequired';
import Alert from './editors/Alert'; import Alert from './Alert';
import { import {
serverModerationStatusFetchData, serverModerationStatusFetchData,
...@@ -144,7 +144,7 @@ class GenericModule extends MyComponent { ...@@ -144,7 +144,7 @@ class GenericModule extends MyComponent {
forceSave: true, forceSave: true,
}) })
this.handleClosePendingModeration(); this.handleClosePendingModeration();
this.handleOpenEditor(); this.handleOpenEditor(true);
} }
handleEditCurrent = () => { handleEditCurrent = () => {
......
...@@ -22,7 +22,7 @@ import { versionsFetchData, versionsInvalidated } from '../../../generated/actio ...@@ -22,7 +22,7 @@ import { versionsFetchData, versionsInvalidated } from '../../../generated/actio
import Loading from '../../other/Loading'; import Loading from '../../other/Loading';
import dateTimeStrToStr from '../../../utils/dateTimeStrToStr'; import dateTimeStrToStr from '../../../utils/dateTimeStrToStr';
import editorStyle from './editors/editorStyle'; import editorStyle from './editorStyle';
import _ from 'lodash'; import _ from 'lodash';
const styles = theme => ({ const styles = theme => ({
......
...@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; ...@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import { withStyles } from '@material-ui/core/styles'; import { withStyles } from '@material-ui/core/styles';
import Snackbar from '@material-ui/core/Snackbar'; import Snackbar from '@material-ui/core/Snackbar';
import DoneIcon from '@material-ui/icons/Done'; import DoneIcon from '@material-ui/icons/Done';
import Loading from '../../../../components/other/Loading' import Loading from '../../other/Loading'
import IconButton from '@material-ui/core/IconButton'; import IconButton from '@material-ui/core/IconButton';
import CloseIcon from '@material-ui/icons/Close'; import CloseIcon from '@material-ui/icons/Close';
......
...@@ -13,7 +13,7 @@ import CloseIcon from '@material-ui/icons/Close'; ...@@ -13,7 +13,7 @@ import CloseIcon from '@material-ui/icons/Close';
import Slide from '@material-ui/core/Slide'; import Slide from '@material-ui/core/Slide';
import Divider from '@material-ui/core/Divider'; import Divider from '@material-ui/core/Divider';
import editorStyle from './editors/editorStyle'; import editorStyle from './editorStyle';
import _ from 'lodash'; import _ from 'lodash';
const styles = theme => ({ const styles = theme => ({
......
...@@ -12,7 +12,7 @@ import format from 'date-fns/format'; ...@@ -12,7 +12,7 @@ import format from 'date-fns/format';
import KeyboardArrowLeftIcon from '@material-ui/icons/KeyboardArrowLeft'; import KeyboardArrowLeftIcon from '@material-ui/icons/KeyboardArrowLeft';
import KeyboardArrowRightIcon from '@material-ui/icons/KeyboardArrowRight'; import KeyboardArrowRightIcon from '@material-ui/icons/KeyboardArrowRight';
import FieldWrapper from './FieldWrapper'; import FieldWrapper from './FieldWrapper';
import dateToDateStr from '../../../../../utils/dateToDateStr'; import dateToDateStr from '../../../../utils/dateToDateStr';
import Field from './Field'; import Field from './Field';
......
...@@ -10,8 +10,8 @@ import FieldWrapper from './FieldWrapper'; ...@@ -10,8 +10,8 @@ import FieldWrapper from './FieldWrapper';
import TextField from '@material-ui/core/TextField'; import TextField from '@material-ui/core/TextField';
import Typography from '@material-ui/core/Typography'; import Typography from '@material-ui/core/Typography';
import Markdown from '../../../../shared/Markdown'; import Markdown from '../../../shared/Markdown';
import LinkText from '../../../../other/TextLink'; import LinkText from '../../../other/TextLink';
import Field from './Field'; import Field from './Field';
const styles = theme => ({ const styles = theme => ({
......
...@@ -17,7 +17,7 @@ import KeyboardArrowUpIcon from '@material-ui/icons/KeyboardArrowUp'; ...@@ -17,7 +17,7 @@ import KeyboardArrowUpIcon from '@material-ui/icons/KeyboardArrowUp';
import Field from './Field'; import Field from './Field';
import Typography from '@material-ui/core/Typography'; import Typography from '@material-ui/core/Typography';
import isUrl from '../../../../../utils/isUrl'; import isUrl from '../../../../utils/isUrl';
const styles = theme => ({ const styles = theme => ({
container: { container: {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment