4 files changed, 182 insertions, 47 deletions
diff --git a/modern/src/settings/AccumulatorsPage.js b/modern/src/settings/AccumulatorsPage.js
index f592445d..3e98612a 100644
--- a/modern/src/settings/AccumulatorsPage.js
+++ b/modern/src/settings/AccumulatorsPage.js
@@ -29,23 +29,23 @@ const AccumulatorsPage = () => {
   const classes = useStyles();
   const t = useTranslation();
 
-  const { id } = useParams();
-  const position = useSelector((state) => state.positions.items[id]);
+  const { deviceId } = useParams();
+  const position = useSelector((state) => state.positions.items[deviceId]);
 
   const [item, setItem] = useState();
 
   useEffect(() => {
     if (position) {
       setItem({
-        deviceId: parseInt(id, 10),
+        deviceId: parseInt(deviceId, 10),
         hours: position.attributes.hours || 0,
         totalDistance: position.attributes.totalDistance || 0,
       });
     }
-  }, [id, position]);
+  }, [deviceId, position]);
 
   const handleSave = async () => {
-    const response = await fetch(`/api/devices/${id}/accumulators`, {
+    const response = await fetch(`/api/devices/${deviceId}/accumulators`, {
       method: 'PUT',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify(item),
diff --git a/modern/src/settings/BaseCommandView.js b/modern/src/settings/BaseCommandView.js
new file mode 100644
index 00000000..51151588
--- /dev/null
+++ b/modern/src/settings/BaseCommandView.js
@@ -0,0 +1,58 @@
+import React, { useEffect, useState } from 'react';
+import {
+  TextField, FormControlLabel, Checkbox,
+} from '@material-ui/core';
+import { useTranslation } from '../LocalizationProvider';
+import SelectField from '../form/SelectField';
+import { prefixString } from '../common/stringUtils';
+import useCommandAttributes from '../attributes/useCommandAttributes';
+
+const BaseCommandView = ({ item, setItem }) => {
+  const t = useTranslation();
+
+  const availableAttributes = useCommandAttributes(t);
+
+  const [attributes, setAttributes] = useState([]);
+
+  useEffect(() => {
+    if (item && item.type) {
+      setAttributes(availableAttributes[item.type] || []);
+    } else {
+      setAttributes([]);
+    }
+  }, [availableAttributes, item]);
+
+  return (
+    <>
+      <SelectField
+        margin="normal"
+        value={item.type || ''}
+        onChange={(e) => setItem({ ...item, type: e.target.value, attributes: {} })}
+        endpoint="/api/commands/types"
+        keyGetter={(it) => it.type}
+        titleGetter={(it) => t(prefixString('command', it.type))}
+        label={t('sharedType')}
+        variant="filled"
+      />
+      {attributes.map((attribute) => (
+        <TextField
+          margin="normal"
+          value={item.attributes[attribute.key]}
+          onChange={(e) => {
+            const updateItem = { ...item, attributes: { ...item.attributes } };
+            updateItem.attributes[attribute.key] = e.target.value;
+            setItem(updateItem);
+          }}
+          label={attribute.name}
+          variant="filled"
+        />
+      ))}
+      <FormControlLabel
+        control={<Checkbox checked={item.textChannel} onChange={(event) => setItem({ ...item, textChannel: event.target.checked })} />}
+        label={t('commandSendSms')}
+      />
+    </>
+  );
+};
+
+export default BaseCommandView;
diff --git a/modern/src/settings/CommandPage.js b/modern/src/settings/CommandPage.js
index 0b0f54b6..0cd440e1 100644
--- a/modern/src/settings/CommandPage.js
+++ b/modern/src/settings/CommandPage.js
@@ -1,13 +1,11 @@
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 import {
-  Accordion, AccordionSummary, AccordionDetails, makeStyles, Typography, TextField, FormControlLabel, Checkbox,
+  Accordion, AccordionSummary, AccordionDetails, makeStyles, Typography, TextField,
 } from '@material-ui/core';
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
 import EditItemView from '../EditItemView';
 import { useTranslation } from '../LocalizationProvider';
-import SelectField from '../form/SelectField';
-import { prefixString } from '../common/stringUtils';
-import useCommandAttributes from '../attributes/useCommandAttributes';
+import BaseCommandView from './BaseCommandView';
 
 const useStyles = makeStyles(() => ({
   details: {
@@ -19,16 +17,7 @@ const CommandPage = () => {
   const classes = useStyles();
   const t = useTranslation();
 
-  const availableAttributes = useCommandAttributes(t);
-
   const [item, setItem] = useState();
-  const [attributes, setAttributes] = useState([]);
-
-  useEffect(() => {
-    if (item && item.type) {
-      setAttributes(availableAttributes[item.type] || []);
-    }
-  }, [availableAttributes, item]);
 
   const validate = () => item && item.type;
 
@@ -49,34 +38,7 @@ const CommandPage = () => {
               label={t('sharedDescription')}
               variant="filled"
             />
-            <SelectField
-              margin="normal"
-              value={item.type || 'custom'}
-              emptyValue={null}
-              onChange={(e) => setItem({ ...item, type: e.target.value, attributes: {} })}
-              endpoint="/api/commands/types"
-              keyGetter={(it) => it.type}
-              titleGetter={(it) => t(prefixString('command', it.type))}
-              label={t('sharedType')}
-              variant="filled"
-            />
-            {attributes.map((attribute) => (
-              <TextField
-                margin="normal"
-                value={item.attributes[attribute.key]}
-                onChange={(e) => {
-                  const updateItem = { ...item, attributes: { ...item.attributes } };
-                  updateItem.attributes[attribute.key] = e.target.value;
-                  setItem(updateItem);
-                }}
-                label={attribute.name}
-                variant="filled"
-              />
-            ))}
-            <FormControlLabel
-              control={<Checkbox checked={item.textChannel} onChange={(event) => setItem({ ...item, textChannel: event.target.checked })} />}
-              label={t('commandSendSms')}
-            />
+            <BaseCommandView item={item} setItem={setItem} />
           </AccordionDetails>
         </Accordion>
       )}
diff --git a/modern/src/settings/SendCommandPage.js b/modern/src/settings/SendCommandPage.js
new file mode 100644
index 00000000..91130fa1
--- /dev/null
+++ b/modern/src/settings/SendCommandPage.js
@@ -0,0 +1,115 @@
+import React, { useState } from 'react';
+import { useHistory, useParams } from 'react-router-dom';
+import {
+  Accordion, AccordionSummary, AccordionDetails, makeStyles, Typography, Container, Button, FormControl,
+} from '@material-ui/core';
+import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
+import { useTranslation } from '../LocalizationProvider';
+import OptionsLayout from './OptionsLayout';
+import BaseCommandView from './BaseCommandView';
+import SelectField from '../form/SelectField';
+
+const useStyles = makeStyles((theme) => ({
+  container: {
+    marginTop: theme.spacing(2),
+  },
+  buttons: {
+    display: 'flex',
+    justifyContent: 'space-evenly',
+    '& > *': {
+      flexBasis: '33%',
+    },
+  },
+  details: {
+    flexDirection: 'column',
+  },
+}));
+
+const SendCommandPage = () => {
+  const history = useHistory();
+  const classes = useStyles();
+  const t = useTranslation();
+
+  const { deviceId } = useParams();
+
+  const [savedId, setSavedId] = useState(0);
+  const [item, setItem] = useState({});
+
+  const handleSend = async () => {
+    let command;
+    if (savedId) {
+      const response = await fetch(`/api/commands/${savedId}`);
+      if (response.ok) {
+        command = await response.json();
+      }
+    } else {
+      command = item;
+    }
+
+    command.deviceId = parseInt(deviceId, 10);
+
+    const response = await fetch('/api/commands/send', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(command),
+    });
+
+    if (response.ok) {
+      history.goBack();
+    }
+  };
+
+  const validate = () => savedId || (item && item.type);
+
+  return (
+    <OptionsLayout>
+      <Container maxWidth="xs" className={classes.container}>
+        <Accordion defaultExpanded>
+          <AccordionSummary expandIcon={<ExpandMoreIcon />}>
+            <Typography variant="subtitle1">
+              {t('sharedRequired')}
+            </Typography>
+          </AccordionSummary>
+          <AccordionDetails className={classes.details}>
+            <SelectField
+              margin="normal"
+              value={savedId}
+              emptyTitle={t('sharedNew')}
+              onChange={(e) => setSavedId(e.target.value)}
+              endpoint={`/api/commands/send?deviceId=${deviceId}`}
+              titleGetter={(it) => it.description}
+              label={t('sharedSavedCommand')}
+              variant="filled"
+            />
+            {!savedId && (
+            <BaseCommandView item={item} setItem={setItem} />
+            )}
+          </AccordionDetails>
+        </Accordion>
+        <FormControl fullWidth margin="normal">
+          <div className={classes.buttons}>
+            <Button
+              type="button"
+              color="primary"
+              variant="outlined"
+              onClick={() => history.goBack()}
+            >
+              {t('sharedCancel')}
+            </Button>
+            <Button
+              type="button"
+              color="primary"
+              variant="contained"
+              onClick={handleSend}
+              disabled={!validate()}
+            >
+              {t('commandSend')}
+            </Button>
+          </div>
+        </FormControl>
+      </Container>
+    </OptionsLayout>
+  );
+};
+
+export default SendCommandPage;