init server tags prototype with config variable and corresponding dro…

…pdown in room settings
Ithanil · Apr 22, 2024 · 9dfbd56 · 9dfbd56
1 parent 3f64bef
commit 9dfbd56
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/app/javascript/components/rooms/room/room_settings/RoomSettings.jsx b/app/javascript/components/rooms/room/room_settings/RoomSettings.jsx
@@ -16,7 +16,7 @@
 
 import React from 'react';
 import {
-  Row, Col, Button, Stack,
+  Row, Col, Button, Stack, Dropdown,
 } from 'react-bootstrap';
 import { useParams } from 'react-router-dom';
 import Card from 'react-bootstrap/Card';
@@ -33,6 +33,7 @@ import { useAuth } from '../../../../contexts/auth/AuthProvider';
 import UpdateRoomNameForm from './forms/UpdateRoomNameForm';
 import useRoom from '../../../../hooks/queries/rooms/useRoom';
 import UnshareRoom from './UnshareRoom';
+import SimpleSelect from '../../../shared_components/utilities/SimpleSelect';
 
 export default function RoomSettings() {
   const { t } = useTranslation();
@@ -45,6 +46,12 @@ export default function RoomSettings() {
   const updateMutationWrapper = () => useUpdateRoomSetting(friendlyId);
   const deleteMutationWrapper = (args) => useDeleteRoom({ friendlyId, ...args });
 
+  const serverTagsMap = (process.env.SERVER_TAGS_MAP || '').split(",").reduce((map, pair) => {
+    let [key, value] = pair.split(":");
+    map[key] = value;
+    return map;
+  }, {});
+
   return (
     <div id="room-settings" className="pt-3">
       <Card className="mx-auto p-4 border-0 card-shadow">
@@ -66,6 +73,23 @@ export default function RoomSettings() {
                 config={roomConfigs?.glModeratorAccessCode}
                 description={t('room.settings.generate_mods_access_code')}
               />
+              <Row>
+                <SimpleSelect defaultValue=''>
+                  {
+                    <Dropdown.Item key='' value=''>
+                    </Dropdown.Item>
+                  }
+
+                  {
+                    <Dropdown.Item
+                      key={Object.keys(serverTagsMap)[0]}
+                      value={Object.values(serverTagsMap)[0]}
+                    >
+                      { Object.values(serverTagsMap)[0] }
+                    </Dropdown.Item>
+                  }
+                </SimpleSelect>
+            </Row>
             </Col>
             <Col className="ps-4">
               <Row> <h6 className="text-brand">{ t('room.settings.user_settings') }</h6> </Row>

diff --git a/app/models/application_record.rb b/app/models/application_record.rb
@@ -23,4 +23,8 @@ class ApplicationRecord < ActiveRecord::Base
   def virus_scan?
     ENV.fetch('CLAMAV_SCANNING', 'false') == 'true'
   end
+
+  def server_tags_hash
+    ENV.fetch('SERVER_TAGS_MAP', '').split(",").map { |pair| pair.split(":") }.to_h
+  end
 end
diff --git a/esbuild.dev.mjs b/esbuild.dev.mjs
@@ -2,6 +2,7 @@ import * as esbuild from 'esbuild';
 
 // Fetch 'RELATIVE_URL_ROOT' ENV variable value while removing any trailing slashes.
 const relativeUrlRoot = (process.env.RELATIVE_URL_ROOT || '').replace(/\/*$/, '');
+const serverTagsMap = (process.env.SERVER_TAGS_MAP || '');
 
 esbuild.context({
   entryPoints: ['app/javascript/main.jsx'],
@@ -15,6 +16,7 @@ esbuild.context({
   define: {
     'process.env.RELATIVE_URL_ROOT': `"${relativeUrlRoot}"`,
     'process.env.OMNIAUTH_PATH': `"${relativeUrlRoot}/auth/openid_connect"`, // currently, only OIDC is implemented
+    'process.env.SERVER_TAGS_MAP': `"${serverTagsMap}"`,
   },
 }).then(context => {
   if (process.argv.includes("--watch")) {
@@ -30,4 +32,4 @@ esbuild.context({
 }).catch((e) => {
   console.error('build failed:', e);
   process.exit(1)
-})
+})
diff --git a/esbuild.mjs b/esbuild.mjs
@@ -2,6 +2,7 @@ import * as esbuild from 'esbuild';
 
 // Fetch 'RELATIVE_URL_ROOT' ENV variable value while removing any trailing slashes.
 const relativeUrlRoot = (process.env.RELATIVE_URL_ROOT || '').replace(/\/*$/, '');
+const serverTagsMap = (process.env.SERVER_TAGS_MAP || '');
 
 await esbuild.build({
   entryPoints: ['app/javascript/main.jsx'],
@@ -15,6 +16,7 @@ await esbuild.build({
   define: {
     'process.env.RELATIVE_URL_ROOT': `"${relativeUrlRoot}"`,
     'process.env.OMNIAUTH_PATH': `"${relativeUrlRoot}/auth/openid_connect"`, // currently, only OIDC is implemented
+    'process.env.SERVER_TAGS_MAP': `"${serverTagsMap}"`,
   },
 });