Skip to content
Snippets Groups Projects
Unverified Commit 80ba1b49 authored by Rahul Rodrigues's avatar Rahul Rodrigues Committed by GitHub
Browse files

removed last 2 instances of recordings showing up when recordings disabled (#5518)

* added delete presentation string to en.json and delete presentation form

* removed last 2 instances of recordings that show up when recordings are disabled

* only checking for sitewide recordings disable to remove the recording elements

* removed unnecessary .jsx in import statement
parent d32ef047
Branches
Tags
No related merge requests found
......@@ -19,9 +19,10 @@
module Api
module V1
class RoomsConfigurationsController < ApiController
before_action only: %i[index show] do
before_action only: %i[index] do
ensure_authorized(%w[CreateRoom ManageSiteSettings ManageRoles ManageRooms], friendly_id: params[:friendly_id])
end
skip_before_action :ensure_authenticated, only: %i[show]
# GET /api/v1/rooms_configurations.json
# Fetches and returns all rooms configurations.
......
......@@ -26,6 +26,7 @@ import {
import { toast } from 'react-toastify';
import { useAuth } from '../../contexts/auth/AuthProvider';
import HomepageFeatureCard from './HomepageFeatureCard';
import useRoomConfigValue from '../../hooks/queries/rooms/useRoomConfigValue';
export default function HomePage() {
const { t } = useTranslation();
......@@ -33,6 +34,7 @@ export default function HomePage() {
const navigate = useNavigate();
const [searchParams, setSearchParams] = useSearchParams();
const error = searchParams.get('error');
const { data: recordValue } = useRoomConfigValue('record');
// Redirects the user to the proper page based on signed in status and CreateRoom permission
useEffect(
......@@ -88,6 +90,7 @@ export default function HomePage() {
icon={<ComputerDesktopIcon className="hi-s text-white" />}
/>
</Col>
{ (recordValue !== 'false') && (
<Col className="mb-3">
<HomepageFeatureCard
title={t('homepage.recording_title')}
......@@ -95,6 +98,7 @@ export default function HomePage() {
icon={<VideoCameraIcon className="hi-s text-white" />}
/>
</Col>
)}
<Col className="mb-3">
<HomepageFeatureCard
title={t('homepage.settings_title')}
......
......@@ -42,6 +42,7 @@ import RoomJoinPlaceholder from './RoomJoinPlaceholder';
import useRoomJoinForm from '../../../../hooks/forms/rooms/useRoomJoinForm';
import ButtonLink from '../../../shared_components/utilities/ButtonLink';
import Title from '../../../shared_components/utilities/Title';
import useRoomConfigValue from '../../../../hooks/queries/rooms/useRoomConfigValue';
export default function JoinCard() {
const { t } = useTranslation();
......@@ -54,6 +55,7 @@ export default function JoinCard() {
const roomStatusAPI = useRoomStatus(friendlyId, joinInterval);
const { data: env } = useEnv();
const { data: recordValue } = useRoomConfigValue('record');
const { methods, fields } = useRoomJoinForm();
......@@ -205,6 +207,7 @@ export default function JoinCard() {
<h1 className="mt-2">
{publicRoom?.data.name}
</h1>
{ (recordValue !== 'false') && (
<ButtonLink
variant="brand-outline"
className="mt-3 mb-0 cursor-pointer"
......@@ -212,6 +215,7 @@ export default function JoinCard() {
>
<span> <VideoCameraIcon className="hi-s text-brand" /> {t('view_recordings')} </span>
</ButtonLink>
)}
</Col>
<Col>
<Stack direction="vertical" gap={3}>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment