Remaining command attributes

2 files changed, 34 insertions, 14 deletions

diff --git a/modern/src/settings/CommandSendPage.js b/modern/src/settings/CommandSendPage.js
index a817e11d..cc0dae63 100644
--- a/modern/src/settings/CommandSendPage.js
+++ b/modern/src/settings/CommandSendPage.js
@@ -88,7 +88,7 @@ const CommandSendPage = () => {
               variant="filled"
             />
             {!savedId && (
-            <BaseCommandView item={item} setItem={setItem} />
+              <BaseCommandView item={item} setItem={setItem} />
             )}
           </AccordionDetails>
         </Accordion>
diff --git a/modern/src/settings/components/BaseCommandView.js b/modern/src/settings/components/BaseCommandView.js
index b422e153..836e8789 100644
--- a/modern/src/settings/components/BaseCommandView.js
+++ b/modern/src/settings/components/BaseCommandView.js
@@ -34,19 +34,39 @@ const BaseCommandView = ({ item, setItem }) => {
         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"
-        />
-      ))}
+      {attributes.map(({ key, name, type }) => {
+        if (type === 'boolean') {
+          return (
+            <FormControlLabel
+              control={(
+                <Checkbox
+                  checked={item.attributes[key]}
+                  onChange={(e) => {
+                    const updateItem = { ...item, attributes: { ...item.attributes } };
+                    updateItem.attributes[key] = e.target.checked;
+                    setItem(updateItem);
+                  }}
+                />
+              )}
+              label={name}
+            />
+          );
+        }
+        return (
+          <TextField
+            margin="normal"
+            type={type === 'number' ? 'number' : 'text'}
+            value={item.attributes[key]}
+            onChange={(e) => {
+              const updateItem = { ...item, attributes: { ...item.attributes } };
+              updateItem.attributes[key] = type === 'number' ? Number(e.target.value) : e.target.value;
+              setItem(updateItem);
+            }}
+            label={name}
+            variant="filled"
+          />
+        );
+      })}
       <FormControlLabel
         control={<Checkbox checked={item.textChannel} onChange={(event) => setItem({ ...item, textChannel: event.target.checked })} />}
         label={t('commandSendSms')}