Convert SelectProposal to function component and other fixes

docs/source/dev/login.md

@@ -13,36 +13,36 @@ and authentication has to be delegated to a process dedicated to authentication.
 The authorization for a user to use a beamline is performed via the user portal
 or LIMS system.
 
-### Authentication with single sign on
+### Authentication with single sign-on
 
-MXCUBE can be configured to use Single sign-on (SSO) through OpenIDConnect for
+MXCUBE can be configured to use single sign-on (SSO) through OpenIDConnect for
 user authentication. The OpenIDConnect configuration is located in the
-`server.yaml` file, which should contain an `sso` section like the one below.
+`server.yaml` file, which should contain an `sso` section like the one below:
 
 ```
 sso:
-  USE_SSO: false                                              # True to use SSO false otherwise
+  USE_SSO: false                                              # `true` to use SSO
   ISSUER: https://websso.[site].[com]/realms/[site]/          # OpenIDConnect issuer URI
   LOGOUT_URI: ""                                              # OpenIDConnect logout URI
   TOKEN_INFO_URI: ""                                          # OpenIDConnect token info URI
   CLIENT_SECRET: ASECRETKEY                                   # OpenIDConnect client secret
   CLIENT_ID: mxcube                                           # OpenIDConnect client ID
-  SCOPE: openid email profile                                 # OpenIDConnect defualt scopes, none scope is actually beeing used
+  SCOPE: openid email profile                                 # OpenIDConnect default scopes, none scope is actually being used
   CODE_CHALLANGE_METHOD: S256                                 # OpenIDConnect challange method
 ```
 
 User authorization is delegated to the LIMS client inheriting `AbstractLims` and is performed in the `login` method.
 
-## HTTP Session management
+## HTTP session management
 
-MXCuBE web sessions are meant to expire when there is no activity
+MXCuBE web sessions are meant to expire when there is no activity.
 
 For this purpose:
 
 - Flask configuration setting `PERMANENT_SESSION_LIFETIME` is set
   to the preferred value (seconds).
 
-- Flask configuration setting `SESSION_REFRESH_EACH_REQUEST` is set,
+- Flask configuration setting `SESSION_REFRESH_EACH_REQUEST` is enabled,
   which is the default anyway.
 
 - Flask session setting `session.permanent` is set

ui/src/actions/login.js

@@ -54,27 +54,18 @@ export function hideProposalsForm() {
   };
 }
 
-export function selectProposalAction(prop) {
-  return {
-    type: 'SELECT_PROPOSAL',
-    proposal: prop,
-  };
-}
-
 export function setInitialState(data) {
   return { type: 'SET_INITIAL_STATE', data };
 }
 
-export function selectProposal(number, navigate) {
+export function selectProposal(number) {
   return async (dispatch) => {
     try {
       await sendSelectProposal(number);
-      navigate('/');
       dispatch(hideProposalsForm());
       dispatch(getLoginInfo());
     } catch {
       dispatch(showErrorPanel(true, 'Server refused to select proposal'));
-      navigate('/login');
     }
   };
 }
@@ -108,16 +99,14 @@ export function ssoLogIn() {
 
 export function signOut() {
   return async (dispatch) => {
+    dispatch(resetLoginInfo()); // disconnect sockets before actually logging out (cf. `App.jsx`)
     dispatch(applicationFetched(false));
-    // We make sure that user data is reseted so that websockets
-    // are keept dicconnected while logging out.
-    dispatch(resetLoginInfo());
-    await sendSignOut().finally(() =>
-      dispatch(
-        // Retreiving the user data from the backend
-        getLoginInfo(),
-      ),
-    );
+
+    try {
+      await sendSignOut();
+    } finally {
+      dispatch(getLoginInfo());
+    }
   };
 }
 

ui/src/actions/remoteAccess.js

@@ -16,7 +16,7 @@ import { getLoginInfo } from './login';
 import { showWaitDialog } from './waitDialog';
 
 export function getRaState() {
-  return async (dispatch, getState) => {
+  return async (dispatch) => {
     const data = await fetchRemoteAccessState();
     dispatch({ type: 'SET_RA_STATE', data: data.data });
   };

ui/src/components/LoginForm/ActionButton.jsx

@@ -0,0 +1,38 @@
+import React from 'react';
+import { Button } from 'react-bootstrap';
+
+function ActionButton(props) {
+  const { selectedSession, onClick } = props;
+
+  if (!selectedSession) {
+    return (
+      <Button variant="primary" disabled data-default-styles>
+        Select Proposal
+      </Button>
+    );
+  }
+
+  if (!selectedSession.is_scheduled_beamline) {
+    return (
+      <Button variant="danger" data-default-styles onClick={onClick}>
+        Move here
+      </Button>
+    );
+  }
+
+  if (!selectedSession.is_scheduled_time) {
+    return (
+      <Button variant="warning" data-default-styles onClick={onClick}>
+        Reschedule
+      </Button>
+    );
+  }
+
+  return (
+    <Button variant="primary" data-default-styles onClick={onClick}>
+      Select {selectedSession.code}-{selectedSession.number}
+    </Button>
+  );
+}
+
+export default ActionButton;