final round of fixes and polish

bigbluebutton · Sep 5, 2024 · 2a5e833 · 2a5e833
1 parent fae6ced
commit 2a5e833
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/app/controllers/api/v1/server_tags_controller.rb b/app/controllers/api/v1/server_tags_controller.rb
@@ -33,7 +33,7 @@ def show
         render_data data: allowed_tag_names, status: :ok
       end
 
-      # GET /api/v1/server_tags/fallback_mode
+      # GET /api/v1/server_tags/fallback_mode.json
       # Returns global tag fallback mode (user config or global desired/required)
       def fallback_mode
         render_data data: Rails.configuration.server_tag_fallback_mode, status: :ok

diff --git a/app/javascript/components/rooms/room/room_settings/RoomSettings.jsx b/app/javascript/components/rooms/room/room_settings/RoomSettings.jsx
@@ -45,7 +45,7 @@ export default function RoomSettings() {
   const { data: roomConfigs } = useRoomConfigs();
   const { data: room } = useRoom(friendlyId);
   const { data: serverTags } = useServerTags(friendlyId);
-  const { serverTagsFallbackMode } = useServerTagsFallbackMode();
+  const { data: serverTagsFallbackMode } = useServerTagsFallbackMode();
 
   const updateMutationWrapper = () => useUpdateRoomSetting(friendlyId);
   const deleteMutationWrapper = (args) => useDeleteRoom({ friendlyId, ...args });

diff --git a/app/javascript/components/rooms/room/room_settings/ServerTagRow.jsx b/app/javascript/components/rooms/room/room_settings/ServerTagRow.jsx
@@ -109,14 +109,13 @@ export default function ServerTagRow({
 ServerTagRow.defaultProps = {
   currentTag: '',
   tagRequired: false,
-  fallbackMode: 'config',
 };
 
 ServerTagRow.propTypes = {
   updateMutation: PropTypes.func.isRequired,
   currentTag: PropTypes.string,
   tagRequired: PropTypes.bool,
   serverTags: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
-  fallbackMode: PropTypes.string,
+  fallbackMode: PropTypes.string.isRequired,
   description: PropTypes.string.isRequired,
 };
diff --git a/app/services/meeting_starter.rb b/app/services/meeting_starter.rb
@@ -85,9 +85,9 @@ def handle_server_tag(meeting_options:)
       tag_required = meeting_options.delete('serverTagRequired')
       # handle override modes
       if Rails.configuration.server_tag_fallback_mode == 'required'
-        tag_required = true
+        tag_required = 'true'
       elsif Rails.configuration.server_tag_fallback_mode == 'desired'
-        tag_required = false
+        tag_required = 'false'
       end
 
       if tag_names.key?(tag) && !(tag_roles.key?(tag) && tag_roles[tag].exclude?(@room.user.role_id))

diff --git a/config/routes.rb b/config/routes.rb
@@ -85,8 +85,11 @@
       resources :site_settings, only: :index
       resources :rooms_configurations, only: %i[index show], param: :name
       resources :locales, only: %i[index show], param: :name
-      resources :server_tags, only: :show, param: :friendly_id
-      resources :server_tags, only: :fallback_mode
+      resources :server_tags, only: :show, param: :friendly_id do
+        collection do
+          get '/fallback_mode', to: 'server_tags#fallback_mode'
+        end
+      end
 
       namespace :admin do
         resources :users, only: %i[update] do