pass presentation to breakout - frontend

This commit is contained in:
Ramón Souza 2024-07-19 09:53:31 -03:00
parent 8b6cdc6edf
commit 7fbf51054b
4 changed files with 69 additions and 1 deletions

View File

@ -181,12 +181,17 @@ const intlMessages = defineMessages({
id: 'app.createBreakoutRoom.sendInvitationToMods', id: 'app.createBreakoutRoom.sendInvitationToMods',
description: 'label for checkbox send invitation to moderators', description: 'label for checkbox send invitation to moderators',
}, },
currentSlide: {
id: 'app.createBreakoutRoom.currentSlideLabel',
description: 'label for current slide',
},
}); });
const BREAKOUT_LIM = Meteor.settings.public.app.breakouts.breakoutRoomLimit; const BREAKOUT_LIM = Meteor.settings.public.app.breakouts.breakoutRoomLimit;
const MIN_BREAKOUT_ROOMS = 2; const MIN_BREAKOUT_ROOMS = 2;
const MAX_BREAKOUT_ROOMS = BREAKOUT_LIM > MIN_BREAKOUT_ROOMS ? BREAKOUT_LIM : MIN_BREAKOUT_ROOMS; const MAX_BREAKOUT_ROOMS = BREAKOUT_LIM > MIN_BREAKOUT_ROOMS ? BREAKOUT_LIM : MIN_BREAKOUT_ROOMS;
const MIN_BREAKOUT_TIME = 5; const MIN_BREAKOUT_TIME = 5;
const CURRENT_SLIDE_PREFIX = 'current-';
const propTypes = { const propTypes = {
intl: PropTypes.shape({ intl: PropTypes.shape({
@ -244,6 +249,7 @@ class BreakoutRoom extends PureComponent {
this.removeRoomUsers = this.removeRoomUsers.bind(this); this.removeRoomUsers = this.removeRoomUsers.bind(this);
this.renderErrorMessages = this.renderErrorMessages.bind(this); this.renderErrorMessages = this.renderErrorMessages.bind(this);
this.onUpdateBreakouts = this.onUpdateBreakouts.bind(this); this.onUpdateBreakouts = this.onUpdateBreakouts.bind(this);
this.getRoomPresentation = this.getRoomPresentation.bind(this);
this.state = { this.state = {
numberOfRooms: MIN_BREAKOUT_ROOMS, numberOfRooms: MIN_BREAKOUT_ROOMS,
@ -266,6 +272,7 @@ class BreakoutRoom extends PureComponent {
durationIsValid: true, durationIsValid: true,
breakoutJoinedUsers: null, breakoutJoinedUsers: null,
enableUnassingUsers: null, enableUnassingUsers: null,
roomPresentations: [],
}; };
this.btnLevelId = uniqueId('btn-set-level-'); this.btnLevelId = uniqueId('btn-set-level-');
@ -503,6 +510,8 @@ class BreakoutRoom extends PureComponent {
isDefaultName: !this.hasNameChanged(seq), isDefaultName: !this.hasNameChanged(seq),
freeJoin, freeJoin,
sequence: seq, sequence: seq,
allPages: !this.getRoomPresentation(seq).startsWith(CURRENT_SLIDE_PREFIX),
presId: this.getRoomPresentation(seq).replace(CURRENT_SLIDE_PREFIX, ''),
})); }));
createBreakoutRoom(rooms, durationTime, record, captureNotes, captureSlides, inviteMods); createBreakoutRoom(rooms, durationTime, record, captureNotes, captureSlides, inviteMods);
@ -688,6 +697,15 @@ class BreakoutRoom extends PureComponent {
}); });
} }
getRoomPresentation(position) {
const { roomPresentations } = this.state;
const { presentations } = this.props;
const currentPresentation = presentations.find((presentation) => presentation.current);
return roomPresentations[position] || `${CURRENT_SLIDE_PREFIX}${currentPresentation?.id}`;
}
getFullName(position) { getFullName(position) {
const { meetingName } = this.props; const { meetingName } = this.props;
@ -909,11 +927,12 @@ class BreakoutRoom extends PureComponent {
} }
renderRoomsGrid() { renderRoomsGrid() {
const { intl, isUpdate } = this.props; const { intl, isUpdate, presentations } = this.props;
const { const {
leastOneUserIsValid, leastOneUserIsValid,
numberOfRooms, numberOfRooms,
roomNamesChanged, roomNamesChanged,
roomPresentations,
} = this.state; } = this.state;
const rooms = (numberOfRooms > MAX_BREAKOUT_ROOMS const rooms = (numberOfRooms > MAX_BREAKOUT_ROOMS
@ -941,6 +960,17 @@ class BreakoutRoom extends PureComponent {
}); });
}; };
const changeRoomPresentation = (position) => (ev) => {
const newRoomsPresentations = [...roomPresentations];
newRoomsPresentations[position] = ev.target.value;
this.setState({
roomPresentations: newRoomsPresentations,
});
};
const currentPresentation = presentations.find((presentation) => presentation.current);
return ( return (
<Styled.BoxContainer key="rooms-grid-" ref={(r) => { this.listOfUsers = r; }} data-test="roomGrid"> <Styled.BoxContainer key="rooms-grid-" ref={(r) => { this.listOfUsers = r; }} data-test="roomGrid">
{ {
@ -963,6 +993,31 @@ class BreakoutRoom extends PureComponent {
{intl.formatMessage(intlMessages.roomNameInputDesc)} {intl.formatMessage(intlMessages.roomNameInputDesc)}
</div> </div>
</Styled.FreeJoinLabel> </Styled.FreeJoinLabel>
{ presentations.length > 0 ? (
<Styled.BreakoutSlideLabel>
<Styled.InputRooms
value={this.getRoomPresentation(value)}
onChange={changeRoomPresentation(value)}
valid
>
{ currentPresentation?.id ? (
<option key="current-slide" value={`${CURRENT_SLIDE_PREFIX}${currentPresentation.id}`}>
{intl.formatMessage(intlMessages.currentSlide)}
</option>
) : null }
{
presentations.map((presentation) => (
<option
key={presentation.id}
value={presentation.id}
>
{presentation.name}
</option>
))
}
</Styled.InputRooms>
</Styled.BreakoutSlideLabel>
) : null }
<Styled.BreakoutBox id={`breakoutBox-${value}`} onDrop={drop(value)} onDragOver={allowDrop} tabIndex={0}> <Styled.BreakoutBox id={`breakoutBox-${value}`} onDrop={drop(value)} onDragOver={allowDrop} tabIndex={0}>
{this.renderUserItemByRoom(value)} {this.renderUserItemByRoom(value)}
</Styled.BreakoutBox> </Styled.BreakoutBox>

View File

@ -3,6 +3,7 @@ import { withTracker } from 'meteor/react-meteor-data';
import ActionsBarService from '/imports/ui/components/actions-bar/service'; import ActionsBarService from '/imports/ui/components/actions-bar/service';
import BreakoutRoomService from '/imports/ui/components/breakout-room/service'; import BreakoutRoomService from '/imports/ui/components/breakout-room/service';
import CreateBreakoutRoomModal from './component'; import CreateBreakoutRoomModal from './component';
import Presentations from '/imports/api/presentations';
import { isImportSharedNotesFromBreakoutRoomsEnabled, isImportPresentationWithAnnotationsFromBreakoutRoomsEnabled } from '/imports/ui/services/features'; import { isImportSharedNotesFromBreakoutRoomsEnabled, isImportPresentationWithAnnotationsFromBreakoutRoomsEnabled } from '/imports/ui/services/features';
const METEOR_SETTINGS_APP = Meteor.settings.public.app; const METEOR_SETTINGS_APP = Meteor.settings.public.app;
@ -46,4 +47,5 @@ export default withTracker(() => ({
meetingName: ActionsBarService.meetingName(), meetingName: ActionsBarService.meetingName(),
amIModerator: ActionsBarService.amIModerator(), amIModerator: ActionsBarService.amIModerator(),
moveUser: ActionsBarService.moveUser, moveUser: ActionsBarService.moveUser,
presentations: Presentations.find({ 'conversion.done': true }).fetch(),
}))(CreateBreakoutRoomContainer); }))(CreateBreakoutRoomContainer);

View File

@ -68,6 +68,15 @@ const FreeJoinLabel = styled.label`
} }
`; `;
const BreakoutSlideLabel = styled.label`
font-size: ${fontSizeSmall};
font-weight: bolder;
display: flex;
align-items: center;
font-size: ${fontSizeSmall};
margin-bottom: 0.2rem;
`
const BreakoutNameInput = styled.input` const BreakoutNameInput = styled.input`
width: 100%; width: 100%;
text-align: center; text-align: center;
@ -377,4 +386,5 @@ export default {
SubTitle, SubTitle,
Content, Content,
ContentContainer, ContentContainer,
BreakoutSlideLabel,
}; };

View File

@ -1249,6 +1249,7 @@
"app.createBreakoutRoom.setTimeHigherThanMeetingTimeError": "The breakout rooms duration can't exceed the meeting remaining time.", "app.createBreakoutRoom.setTimeHigherThanMeetingTimeError": "The breakout rooms duration can't exceed the meeting remaining time.",
"app.createBreakoutRoom.roomNameInputDesc": "Updates breakout room name", "app.createBreakoutRoom.roomNameInputDesc": "Updates breakout room name",
"app.createBreakoutRoom.movedUserLabel": "Moved {0} to room {1}", "app.createBreakoutRoom.movedUserLabel": "Moved {0} to room {1}",
"app.createBreakoutRoom.currentSlideLabel": "Current slide",
"app.updateBreakoutRoom.modalDesc": "To update or invite a user, simply drag them into the desired room.", "app.updateBreakoutRoom.modalDesc": "To update or invite a user, simply drag them into the desired room.",
"app.updateBreakoutRoom.cancelLabel": "Cancel", "app.updateBreakoutRoom.cancelLabel": "Cancel",
"app.updateBreakoutRoom.title": "Update Breakout Rooms", "app.updateBreakoutRoom.title": "Update Breakout Rooms",