fix: remove machine selector

new-lamassu-admin/src/pages/OperatorInfo/CustomSMS/CustomSMS.js

@@ -21,19 +21,14 @@ const GET_CUSTOM_MESSAGES = gql`
     customMessages {
       id
       event
-      deviceId
       message
     }
   }
 `
 
 const CREATE_CUSTOM_MESSAGE = gql`
-  mutation createCustomMessage(
-    $event: CustomMessageEvent!
-    $deviceId: String!
-    $message: String!
-  ) {
-    createCustomMessage(event: $event, deviceId: $deviceId, message: $message) {
+  mutation createCustomMessage($event: CustomMessageEvent!, $message: String!) {
+    createCustomMessage(event: $event, message: $message) {
       id
     }
   }
@@ -43,15 +38,9 @@ const EDIT_CUSTOM_MESSAGE = gql`
   mutation editCustomMessage(
     $id: ID!
     $event: CustomMessageEvent!
-    $deviceId: String!
     $message: String!
   ) {
-    editCustomMessage(
-      id: $id
-      event: $event
-      deviceId: $deviceId
-      message: $message
-    ) {
+    editCustomMessage(id: $id, event: $event, message: $message) {
       id
     }
   }
@@ -65,15 +54,6 @@ const DELETE_CUSTOM_MESSAGE = gql`
   }
 `
 
-const GET_MACHINES = gql`
-  {
-    machines {
-      name
-      deviceId
-    }
-  }
-`
-
 const EVENT_OPTIONS = [
   { code: 'smsCode', display: 'On SMS confirmation code' },
   { code: 'cashOutDispenseReady', display: 'Cash out dispense ready' }
@@ -91,10 +71,6 @@ const CustomSMS = () => {
     GET_CUSTOM_MESSAGES
   )
 
-  const { data: machinesData, loading: machinesLoading } = useQuery(
-    GET_MACHINES
-  )
-
   const [createMessage] = useMutation(CREATE_CUSTOM_MESSAGE, {
     onError: ({ msg }) => setErrorMsg(msg),
     refetchQueries: () => ['customMessages']
@@ -110,15 +86,7 @@ const CustomSMS = () => {
     refetchQueries: () => ['customMessages']
   })
 
-  const loading = messagesLoading && machinesLoading
-
-  const machineOptions =
-    (machinesData &&
-      R.map(
-        it => ({ code: it.deviceId, display: it.name }),
-        R.path(['machines'])(machinesData)
-      )) ??
-    []
+  const loading = messagesLoading
 
   const handleClose = () => {
     setSelectedSMS(null)
@@ -134,21 +102,12 @@ const CustomSMS = () => {
   const elements = [
     {
       header: 'Event',
-      width: 400,
+      width: 600,
       size: 'sm',
       textAlign: 'left',
       view: it =>
         R.find(ite => R.propEq('event', ite.code, it), EVENT_OPTIONS).display
     },
-    {
-      header: 'Machine',
-      width: 200,
-      size: 'sm',
-      textAlign: 'left',
-      view: it =>
-        R.find(ite => R.propEq('deviceId', ite.code, it), machineOptions)
-          ?.display ?? `All Machines`
-    },
     {
       header: 'Edit',
       width: 100,
@@ -195,7 +154,6 @@ const CustomSMS = () => {
         <CustomSMSModal
           showModal={showModal}
           onClose={handleClose}
-          machineOptions={machineOptions}
           eventOptions={EVENT_OPTIONS}
           sms={selectedSMS}
           creationError={errorMsg}

new-lamassu-admin/src/pages/OperatorInfo/CustomSMS/CustomSMSModal.js

@@ -13,11 +13,6 @@ import styles from './CustomSMS.styles'
 
 const useStyles = makeStyles(styles)
 
-const ALL_MACHINES = {
-  code: 'ALL_MACHINES',
-  display: 'All Machines'
-}
-
 const getErrorMsg = (formikErrors, formikTouched, mutationError) => {
   if (!formikErrors || !formikTouched) return null
   if (mutationError) return 'Internal server error'
@@ -67,7 +62,6 @@ const CustomSMSModal = ({
   showModal,
   onClose,
   sms,
-  machineOptions,
   eventOptions,
   creationError,
   submit
@@ -78,17 +72,11 @@ const CustomSMSModal = ({
 
   const initialValues = {
     event: !R.isNil(sms) ? sms.event : '',
-    device: !R.isNil(sms)
-      ? !R.isNil(sms.deviceId)
-        ? sms.deviceId
-        : 'ALL_MACHINES'
-      : '',
     message: !R.isNil(sms) ? sms.message : ''
   }
 
   const validationSchema = Yup.object().shape({
     event: Yup.string().required('An event is required!'),
-    device: Yup.string().required('A machine is required!'),
     message:
       prefill[selectedEvent]?.validator ??
       Yup.string()
@@ -102,14 +90,12 @@ const CustomSMSModal = ({
           variables: {
             id: sms.id,
             event: values.event,
-            deviceId: values.device,
             message: values.message
           }
         })
       : submit({
           variables: {
             event: values.event,
-            deviceId: values.device,
             message: values.message
           }
         })
@@ -146,15 +132,6 @@ const CustomSMSModal = ({
                   valueProp="code"
                   component={Autocomplete}
                 />
-                <Field
-                  name="device"
-                  label="Machine"
-                  fullWidth
-                  options={[ALL_MACHINES].concat(machineOptions)}
-                  labelProp="display"
-                  valueProp="code"
-                  component={Autocomplete}
-                />
                 <Field
                   name="message"
                   label="Message content"