clean-up beamline actions

Author: walesch-yan

ui/src/actions/beamline.js

@@ -1,38 +1,16 @@
 import { sendExecuteCommand, sendSetValue } from '../api/hardware-object';
 import { sendLogFrontEndTraceBack } from '../api/log';
 
-// Action types
-export const BL_UPDATE_HARDWARE_OBJECT = 'BL_UPDATE_HARDWARE_OBJECT';
-export const BL_UPDATE_HARDWARE_OBJECT_ATTRIBUTE =
-  'BL_UPDATE_HARDWARE_OBJECT_ATTRIBUTE';
-export const BL_UPDATE_HARDWARE_OBJECT_VALUE =
-  'BL_UPDATE_HARDWARE_OBJECT_VALUE';
-export const BL_ATTR_GET_ALL = 'BL_ATTR_GET_ALL';
-export const BL_UPDATE_HARDWARE_OBJECT_STATE =
-  'BL_UPDATE_HARDWARE_OBJECT_STATE';
-export const BL_ATTR_MOV_SET_STATE = 'BL_ATTR_MOV_SET_STATE';
-export const BL_ATTR_ACT_SET_STATE = 'BL_ATTR_ACT_SET_STATE';
-export const BL_ATTR_MOV_SET = 'BL_ATTR_MOV_SET';
-export const BL_ATTR_ACT_SET = 'BL_ATTR_ACT_SET';
-
 export function updateBeamlineHardwareObjectAction(data) {
-  return { type: BL_UPDATE_HARDWARE_OBJECT, data };
+  return { type: 'BL_UPDATE_HARDWARE_OBJECT', data };
 }
 
 export function updateBeamlineHardwareObjectAttributeAction(data) {
-  return { type: BL_UPDATE_HARDWARE_OBJECT_ATTRIBUTE, data };
+  return { type: 'BL_UPDATE_HARDWARE_OBJECT_ATTRIBUTE', data };
 }
 
 export function updateBeamlineHardwareObjectValueAction(data) {
-  return { type: BL_UPDATE_HARDWARE_OBJECT_VALUE, data };
-}
-
-export function getBeamlineAttrsAction(data) {
-  return { type: BL_ATTR_GET_ALL, data };
-}
-
-export function updateBeamlineHardwareObjectStateAction(data) {
-  return { type: BL_UPDATE_HARDWARE_OBJECT_STATE, data };
+  return { type: 'BL_UPDATE_HARDWARE_OBJECT_VALUE', data };
 }
 
 export function setAttribute(name, value) {

ui/src/reducers/beamline.js

@@ -1,12 +1,5 @@
 import { HW_STATE, RUNNING } from '../constants';
 
-// The different states a beamline attribute can assume.
-export const STATE = {
-  IDLE: 'READY',
-  BUSY: 'BUSY',
-  ABORT: 'UNUSABLE',
-};
-
 /**
  *  Initial redux state for beamline hardwareObjects, object containing each beamline
  *  attribute (name, attribute object). Each attribute object in turn have the
@@ -17,93 +10,93 @@ export const STATE = {
  *     state:  hardwareObjects current state, see STATE for more information
  *     msg:    arbitray message describing current state
  */
-export const INITIAL_STATE = {
+const INITIAL_STATE = {
   hardwareObjects: {
     fast_shutter: {
       limits: [0, 1, 1],
       name: 'fast_shutter',
       value: 'undefined',
-      state: 'undefined',
+      state: HW_STATE.UNKNOWN,
       msg: 'UNKNOWN',
       readonly: false,
     },
     safety_shutter: {
       limits: [0, 1, 1],
       name: 'safety_shutter',
       value: 'undefined',
-      state: 'undefined',
+      state: HW_STATE.UNKNOWN,
       msg: 'UNKNOWN',
       readonly: false,
     },
     beamstop: {
       limits: [0, 1, 1],
       name: 'beamstop',
       value: 'undefined',
-      state: 'undefined',
+      state: HW_STATE.UNKNOWN,
       msg: 'UNKNOWN',
       readonly: false,
     },
     capillary: {
       limits: [0, 1, 1],
       name: 'capillary',
       value: 'undefined',
-      state: 'undefined',
+      state: HW_STATE.UNKNOWN,
       msg: 'UNKNOWN',
       readonly: false,
     },
     energy: {
       limits: [0, 1000, 0.1],
       name: 'energy',
       value: '0',
-      state: STATE.IDLE,
+      state: HW_STATE.READY,
       msg: '',
       readonly: false,
     },
     wavelength: {
       limits: [0, 1000, 0.1],
       name: 'energy',
       value: '0',
-      state: STATE.IDLE,
+      state: HW_STATE.READY,
       msg: '',
       readonly: false,
     },
     resolution: {
       limits: [0, 1000, 0.1],
       name: 'resolution',
       value: '0',
-      state: STATE.IDLE,
+      state: HW_STATE.READY,
       msg: '',
       readonly: false,
     },
     transmission: {
       limits: [0, 1000, 0.1],
       name: 'transmission',
       value: '0',
-      state: STATE.IDLE,
+      state: HW_STATE.READY,
       msg: '',
       readonly: false,
     },
     flux: {
       limits: [0, 1000, 0.1],
       name: 'flux',
       value: '0',
-      state: 'STATE.IDLE',
+      state: HW_STATE.READY,
       msg: 'UNKNOWN',
       readonly: false,
     },
     cryo: {
       limits: [0, 1000, 0.1],
       name: 'cryo',
       value: '0',
-      state: 'STATE.IDLE',
+      state: HW_STATE.READY,
       msg: 'UNKNOWN',
       readonly: false,
     },
     machine_info: {
       limits: [],
       name: 'machine_info',
       value: { current: -1, message: '', fillmode: '' },
-      state: 'STATE.IDLE',
+      state: HW_STATE.READY,
       msg: 'UNKNOWN',
       readonly: false,
     },
@@ -149,10 +142,6 @@ export const INITIAL_STATE = {
 // eslint-disable-next-line complexity
 function beamlineReducer(state = INITIAL_STATE, action = {}) {
   switch (action.type) {
-    case 'BL_ATTR_GET_ALL': {
-      return { ...state, ...action.data };
-    }
-
     case 'BL_UPDATE_HARDWARE_OBJECT': {
       const attrData = {
         ...state.hardwareObjects[action.data.name],
@@ -206,28 +195,6 @@ function beamlineReducer(state = INITIAL_STATE, action = {}) {
         },
       };
     }
-    case 'BL_ACT_SET': {
-      return {
-        ...state,
-        actuators: {
-          ...state.actuators,
-          [action.data.name]: action.data,
-        },
-      };
-    }
-    case 'BL_UPDATE_HARDWARE_OBJECT_STATE': {
-      const data = { ...state };
-      data.hardwareObjects[action.data.name].state = action.data.state;
-      return data;
-    }
-
-    case 'SAVE_MOTOR_POSITIONS': {
-      return {
-        ...state,
-        motors: { ...state.motors, ...action.data },
-        zoom: action.data.zoom.position,
-      };
-    }
     case 'SAVE_MOTOR_POSITION': {
       return {
         ...state,