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

fix for when user does not have can create room permissions rooms page loads...

fix for when user does not have can create room permissions rooms page loads and doesnt error out (#5602)

Co-authored-by: default avatarAhmad Farhat <ahmad.af.farhat@gmail.com>
parent 98485ddf
No related branches found
No related tags found
No related merge requests found
......@@ -28,9 +28,6 @@ module Api
before_action only: %i[update update_visibility recording_url] do
ensure_authorized(%w[ManageRecordings SharedRoom PublicRecordings], record_id: params[:id])
end
before_action only: %i[index recordings_count] do
ensure_authorized('CreateRoom')
end
# GET /api/v1/recordings.json
# Returns all of the current_user's recordings
......
......@@ -23,7 +23,7 @@ module Api
before_action :find_room, only: %i[show update destroy recordings recordings_processing purge_presentation public_show public_recordings]
before_action only: %i[create index] do
before_action only: %i[create] do
ensure_authorized('CreateRoom')
end
before_action only: %i[create] do
......
......@@ -26,6 +26,7 @@ import UserBoardIcon from './UserBoardIcon';
export default function EmptyRoomsList() {
const { t } = useTranslation();
const currentUser = useAuth();
const canCreate = currentUser?.permissions.CreateRoom;
const mutationWrapper = (args) => useCreateRoom({ userId: currentUser.id, ...args });
return (
......@@ -39,11 +40,13 @@ export default function EmptyRoomsList() {
<Card.Text>
{ t('room.rooms_list_empty_create_room') }
</Card.Text>
{ (canCreate === 'true') && (
<Modal
modalButton={<Button variant="brand" className="ms-auto me-xxl-1">{ t('room.add_new_room') }</Button>}
title={t('room.create_new_room')}
body={<CreateRoomForm mutation={mutationWrapper} userId={currentUser.id} />}
/>
)}
</Card.Body>
</Card>
</div>
......
......@@ -35,6 +35,7 @@ export default function RoomsList() {
const [searchInput, setSearchInput] = useState('');
const { isLoading, data: rooms } = useRooms(searchInput);
const currentUser = useAuth();
const canCreate = currentUser?.permissions.CreateRoom;
const mutationWrapper = (args) => useCreateRoom({ userId: currentUser.id, ...args });
if (!isLoading && rooms?.length === 0 && !searchInput) {
......@@ -47,6 +48,7 @@ export default function RoomsList() {
<div>
<SearchBar searchInput={searchInput} id="rooms-search" setSearchInput={setSearchInput} />
</div>
{ (canCreate === 'true') && (
<Modal
modalButton={(
<Button
......@@ -58,6 +60,7 @@ export default function RoomsList() {
title={t('room.create_new_room')}
body={<CreateRoomForm mutation={mutationWrapper} userId={currentUser.id} />}
/>
)}
</Stack>
<Row className="g-4 mt-4">
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment