rubocop + change tagRequired toggle to react-bootstrap Radio buttons …

…inside Cols
Ithanil · Apr 26, 2024 · f58abd9 · f58abd9
1 parent bbf17a2
commit f58abd9
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 25 deletions.
diff --git a/app/javascript/components/rooms/room/room_settings/ServerTagRow.jsx b/app/javascript/components/rooms/room/room_settings/ServerTagRow.jsx
@@ -16,7 +16,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Row, Dropdown } from 'react-bootstrap';
+import { Row, Col, Dropdown, ButtonGroup, ToggleButton } from 'react-bootstrap';
 import SimpleSelect from '../../../shared_components/utilities/SimpleSelect';
 
 export default function ServerTagRow({
@@ -54,28 +54,51 @@ export default function ServerTagRow({
 
   return (
     <Row>
-      <SimpleSelect defaultValue={getTagName(currentTag)}>
-        {[
-          <Dropdown.Item
-            key=""
-            value={process.env.DEFAULT_TAG_NAME}
-            onClick={() => updateAPI.mutate({ settingName: 'serverTag', settingValue: '' })}
+      <Col>
+        <SimpleSelect defaultValue={getTagName(currentTag)}>
+          {[
+            <Dropdown.Item
+              key=""
+              value={process.env.DEFAULT_TAG_NAME}
+              onClick={() => updateAPI.mutate({ settingName: 'serverTag', settingValue: '' })}
+            >
+              {process.env.DEFAULT_TAG_NAME}
+            </Dropdown.Item>,
+          ].concat(dropdownTags)}
+        </SimpleSelect>
+      </Col>
+      <Col>
+        <ButtonGroup>
+          <ToggleButton
+            key="desired"
+            id="desired"
+            type="radio"
+            variant='outline-success'
+            name="radio"
+            checked={tagRequired === false}
+            onChange={(event) => {
+              console.log(event);
+              updateAPI.mutate({ settingName: 'serverTagRequired', settingValue: false });
+            }}
           >
-            {process.env.DEFAULT_TAG_NAME}
-          </Dropdown.Item>,
-        ].concat(dropdownTags)}
-      </SimpleSelect>
-      <div className="form-switch">
-        <input
-          className="form-check-input fs-5"
-          type="checkbox"
-          id="serverTagRequired"
-          checked={tagRequired}
-          onChange={(event) => {
-            updateAPI.mutate({ settingName: 'serverTagRequired', settingValue: event.target.checked });
-          }}
-        />
-      </div>
+            Desired
+          </ToggleButton>
+          <ToggleButton
+            key="required"
+            id="required"
+            type="radio"
+            variant='outline-danger'
+            name="radio"
+            checked={tagRequired === true}
+            onChange={(event) => {
+              console.log(event);
+              updateAPI.mutate({ settingName: 'serverTagRequired', settingValue: true });
+            }}
+          >
+            Required
+          </ToggleButton>
+        </ButtonGroup>
+      </Col>
     </Row>
   );
 }

diff --git a/app/services/meeting_starter.rb b/app/services/meeting_starter.rb
@@ -77,9 +77,9 @@ def computed_options(access_code:)
   def handle_server_tag(meeting_options:)
     if meeting_options['serverTag'].present?
       tag = meeting_options.delete('serverTag')
-      tagRequired = meeting_options.delete('serverTagRequired')
-      tagParam = tagRequired == 'true' ? tag + '!' : tag
-      meeting_options.store('meta_server-tag', tagParam) if Rails.configuration.server_tag_names.key?(tag)
+      tag_required = meeting_options.delete('serverTagRequired')
+      tag_param = tag_required == 'true' ? "#{tag} !" : tag
+      meeting_options.store('meta_server-tag', tag_param) if Rails.configuration.server_tag_names.key?(tag)
     else
       meeting_options.delete('serverTag')
       meeting_options.delete('serverTagRequired')