frontend/src/actions/message.actions.js

@@ -1,11 +0,0 @@
-export const ADD_MESSAGE = 'ADD_MESSAGE'
-
-export function addMessage(type, text) {
-    return { type: ADD_MESSAGE, text, messageType: type };
-}
-
-export const REMOVE_OLDEST_MESSAGE = 'REMOVE_OLDEST_MESSAGE'
-
-export function removeOldestMessage() {
-    return { type: REMOVE_OLDEST_MESSAGE }
-}

frontend/src/components/message-list.js

@@ -1,23 +0,0 @@
-export function MessageList({ messages }) {
-    if (!Array.isArray(messages)) return null;
-
-    return (
-        <div className="columns" style={{marginTop:"1em"}}>
-            <div className="column is-4 is-offset-4">
-                <div className="messages">
-                {
-                    messages.map((m, i) => {
-                    return (
-                        <div key={`message-${i}`} className={`message is-${m.type}`}>
-                            <div className="message-body">
-                                {m.text}
-                            </div>
-                        </div>
-                    )
-                    })
-                }
-                </div>
-            </div>
-        </div>
-    );
-}

frontend/src/pages/login.js

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import { ConnectedPage as Page } from './page';
+import Page from './page';
 import { login } from '../actions/auth.actions';
 import { connect } from 'react-redux';
 
@@ -8,7 +8,6 @@ export function LoginPage({ dispatch, isLoggedIn, history }) {
     const [ formData, setFormData ] = useState({username: '', password: ''});
     const onUsernameChange = evt => setFormData({ ...formData, username: evt.target.value });
     const onPasswordChange = evt => setFormData({ ...formData, password: evt.target.value });
-   
     const onSubmit = evt => {
         evt.preventDefault();
         const { username, password } = formData;
@@ -19,8 +18,9 @@ export function LoginPage({ dispatch, isLoggedIn, history }) {
        if (isLoggedIn) history.push('/home');
     }, [isLoggedIn]);
 
+
     return (
-        <Page title="Login">
+        <Page>
             <div className="section">
                 <div className="columns">
                     <div className="column is-4 is-offset-4">

frontend/src/pages/page.js

@@ -1,33 +1,13 @@
 import React, { useEffect } from 'react'
-import { MessageList } from '../components/message-list';
-import { connect } from 'react-redux';
-import { removeOldestMessage } from '../actions/message.actions';
 
-export default function Page({ title, messages, dispatch, children }) {
+export default function Page({ title, children }) {
   useEffect(() => {
     document.title = title ? `${title } - PleaseWait` : 'PleaseWait';
   });
 
-  useEffect(() => {
-    if (!Array.isArray(messages) || messages.length === 0) return;
-
-    let timeoutId = setTimeout(() => {
-      dispatch(removeOldestMessage());
-    }, 5000);
-
-    return () => clearTimeout(timeoutId);
-  }, [messages])
-
   return (
     <div className="container-fluid">
-      <MessageList messages={messages} />
       { children }
     </div>
   );
 }
-
-function mapStateToProps(state) {
-  return { messages: state.messages.sortedByTimestamp };
-}
-
-export const ConnectedPage = connect(mapStateToProps)(Page);

frontend/src/reducers/messages.reducers.js

@@ -1,32 +0,0 @@
-import { ADD_MESSAGE, REMOVE_OLDEST_MESSAGE } from "../actions/message.actions";
-
-const initialState = {
-    sortedByTimestamp: []
-};
-
-export function messagesReducer(state = initialState, action) {
-    switch(action.type) {
-        case ADD_MESSAGE:
-            return handleAddMessage(state, action);
-        case REMOVE_OLDEST_MESSAGE:
-            return handleRemoveOldestMessage(state, action);
-    };
-    return state;
-}
-
-function handleAddMessage(state, action) {
-    return {
-        ...state,
-        sortedByTimestamp: [
-            { ts: Date.now(), text: action.text, type: action.messageType },
-            ...state.sortedByTimestamp
-        ]
-    }
-};
-
-function handleRemoveOldestMessage(state, action) {
-    return {
-        ...state,
-        sortedByTimestamp: state.sortedByTimestamp.slice(0, -1)
-    }
-};

frontend/src/reducers/session.reducers.js

@@ -15,7 +15,7 @@ export function sessionReducer(state = initialState, action) {
 
 function handleLoginSuccess(state, action) {
     return {
-        ...state,
+        ...state.user,
         isLoggedIn: true,
         user: {
             username: action.username,

frontend/src/sagas/auth.sagas.js

@@ -1,6 +1,5 @@
 import { call, put } from 'redux-saga/effects';
 import { loginFailure, loginSuccess } from '../actions/auth.actions';
-import { addMessage } from '../actions/message.actions';
 
 export function* loginSaga(action) {
     let result;
@@ -8,13 +7,10 @@ export function* loginSaga(action) {
         result = yield call(doLogin, action.username, action.password);
     } catch(err) {
         yield put(loginFailure(action.username, err));
-        yield put(addMessage('danger', "Une erreur inconnue bloque le fonctionnement normal de l'application. Veuillez réessayer plus tard."));
     }
 
     if ('error' in result) {
         yield put(loginFailure(action.username, result.error));
-        const message = result.error.message ? result.error.message : result.error.toString();
-        yield put(addMessage('danger', message));
         return
     }
 

frontend/src/store/store.js

@@ -2,13 +2,11 @@ import { createStore, applyMiddleware, combineReducers, compose } from 'redux'
 import createSagaMiddleware from 'redux-saga'
 import rootSaga from '../sagas/root'
 import { sessionReducer } from '../reducers/session.reducers';
-import { messagesReducer } from '../reducers/messages.reducers';
 
 const sagaMiddleware = createSagaMiddleware()
 
 const rootReducer = combineReducers({
   session: sessionReducer,
-  messages: messagesReducer,
 });
 
 const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;