Skip to content
Snippets Groups Projects
Unverified Commit f79c975b authored by Ahmad Farhat's avatar Ahmad Farhat Committed by GitHub
Browse files

Minor changes and bug fixes (#4061)

parent c54bc3ee
Branches
No related tags found
No related merge requests found
Showing
with 23 additions and 23 deletions
$admin-card-height: 700px;
$admin-card-height: 550px;
#admin-panel {
padding-bottom: $header-height;
#admin-sidebar {
height: 100%;
border-right: 2px solid whitesmoke;
......
......@@ -27,7 +27,7 @@
}
.regular-height {
height: calc(100vh - $header-height - $footer-height);
min-height: calc(100vh - $header-height - $footer-height);
}
.no-header-height {
......
......@@ -45,7 +45,7 @@ class ExternalController < ApplicationController
# This is needed to handle duplicate requests
unless Recording.exists?(record_id:)
@room = Room.find_by(meeting_id: response[0]['meeting_id'])
@room.update(recordings_processing: @room.recordings_processing - 1)
@room.update(recordings_processing: @room.recordings_processing - 1) unless @room.recordings_processing.zero?
end
RecordingCreator.new(recording:).call
......
......@@ -20,7 +20,7 @@ export default function EditUser() {
if (isLoading) return <Spinner />;
return (
<div id="admin-panel">
<div id="admin-panel" className="pb-3">
<h3 className="py-5"> { t('admin.admin_panel') } </h3>
<Card className="border-0 shadow-sm">
<Tab.Container activekey="users">
......
......@@ -22,7 +22,7 @@ export default function ManageUsers() {
const { data: registrationMethod } = useSiteSetting('RegistrationMethod');
return (
<div id="admin-panel">
<div id="admin-panel" className="pb-3">
<h3 className="py-5">{ t('admin.admin_panel') }</h3>
<Card className="border-0 shadow-sm">
<Tab.Container activeKey="users">
......
......@@ -21,7 +21,7 @@ export default function EditRole() {
}
return (
<div id="admin-panel">
<div id="admin-panel" className="pb-3">
<h3 className="py-5">{ t('admin.admin_panel') }</h3>
<Card className="border-0 shadow-sm">
<Tab.Container activeKey="roles">
......
......@@ -15,7 +15,7 @@ export default function Roles() {
const { data: roles, isLoading } = useRoles(searchInput);
return (
<div id="admin-panel">
<div id="admin-panel" className="pb-3">
<h3 className="py-5"> { t('admin.admin_panel') } </h3>
<Card className="border-0 shadow-sm">
<Tab.Container activeKey="roles">
......
......@@ -15,7 +15,7 @@ export default function RoomConfig() {
const { data: roomConfigs, isLoading } = useRoomConfigs();
return (
<div id="admin-panel">
<div id="admin-panel" className="pb-3">
<h3 className="py-5"> { t('admin.admin_panel') } </h3>
<Card className="border-0 shadow-sm">
<Tab.Container activeKey="room_configuration">
......
......@@ -18,7 +18,7 @@ export default function ServerRecordings() {
const { isLoading, data: serverRecordings } = useServerRecordings(searchInput, page);
return (
<div id="admin-panel">
<div id="admin-panel" className="pb-3">
<h3 className="py-5"> {t('admin.admin_panel')} </h3>
<Card className="border-0 shadow-sm">
<Tab.Container activeKey="server_recordings">
......
......@@ -18,7 +18,7 @@ export default function ServerRooms() {
const { isLoading, data: serverRooms } = useServerRooms(searchInput, page);
return (
<div id="admin-panel">
<div id="admin-panel" className="pb-3">
<h3 className="py-5"> { t('admin.admin_panel') } </h3>
<Card className="border-0 shadow-sm">
<Tab.Container activeKey="server_rooms">
......
......@@ -13,7 +13,7 @@ import Registration from './registration/Registration';
export default function SiteSettings() {
const { t } = useTranslation();
return (
<div id="admin-panel">
<div id="admin-panel" className="pb-3">
<h3 className="py-5">{ t('admin.admin_panel') }</h3>
<Card className="border-0 shadow-sm">
<Tab.Container activeKey="site_settings">
......
......@@ -8,7 +8,7 @@ export default function ProcessingRecordingRow() {
return (
<tr className="align-middle">
<td className="text-dark">
<td className="text-dark border-end-0">
<Stack direction="horizontal" className="py-2">
<div className="recording-icon-circle rounded-circle me-3 d-flex align-items-center justify-content-center">
<VideoCameraIcon className="hi-s text-brand" />
......@@ -16,11 +16,11 @@ export default function ProcessingRecordingRow() {
{ t('recording.processing_recording') }
</Stack>
</td>
<td />
<td />
<td />
<td />
<td />
<td className="border-0" />
<td className="border-0" />
<td className="border-0" />
<td className="border-0" />
<td className="border-0" />
</tr>
);
}
......@@ -20,7 +20,7 @@ export default function Recordings() {
<SearchBar searchInput={searchInput} setSearchInput={setSearchInput} />
</div>
</Stack>
<Card className="border-0 shadow-sm p-0 mt-4">
<Card className="border-0 shadow-sm p-0 mt-4 mb-5">
<RecordingsList
recordings={recordings?.data}
isLoading={isLoading}
......
......@@ -29,12 +29,14 @@ export default function RecordingsList({
? (
recordings?.map((recording) => <RecordingRow key={recording.id} recording={recording} />)
)
: (
: (recordingsProcessing === 0
&& (
<tr>
<td className="fw-bold" colSpan="6">
{ t('recording.no_recording_found') }
</td>
</tr>
)
))}
</tbody>
</Table>
......
......@@ -24,7 +24,7 @@ export default function RoomRecordings() {
<SearchBar searchInput={searchInput} setSearchInput={setSearchInput} />
</div>
</Stack>
<Card className="border-0 shadow-sm mt-4">
<Card className="border-0 shadow-sm mt-4 mb-5">
<RecordingsList
recordings={roomRecordings?.data}
RecordingRow={RoomsRecordingRow}
......
......@@ -159,7 +159,7 @@ RSpec.describe ExternalController, type: :controller do
end
describe '#recording_ready' do
let(:room) { create(:room) }
let(:room) { create(:room, recordings_processing: 1) }
before do
allow_any_instance_of(BigBlueButtonApi).to receive(:decode_jwt).and_return(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment