feat: work

config/webpack.config.js

@@ -840,13 +840,28 @@ module.exports = function (webpackEnv) {
 							console.log(
 								`Overwritten ${originalPath} -> ${newPath}${originalExt}`
 							);
-							result.request = `${newPath}${originalExt}`;
+							result.request = result.request.replace(
+								originalPath,
+								`${newPath}${originalExt}`
+							);
 							result.context = path.dirname(
-								`${newPath}.${originalExt}`
+								`${newPath}${originalExt}`
 							);
-
-							//result.createData.resource = `${newPath}${originalExt}`;
-							//result.createData.context = path.dirname(`${newPath}.${originalExt}`);
+							if (result.createData.request) {
+								result.createData.resource =
+									result.createData.resource.replace(
+										paths.appSrc,
+										paths.appExtensions
+									);
+								result.createData.request =
+									result.createData.request.replace(
+										originalPath,
+										`${newPath}`
+									);
+								result.createData.context = path.dirname(
+									`${newPath}${originalExt}`
+								);
+							}
 						} else {
 							console.log(
 								`No createData ${originalPath} -> ${newPath}${originalExt}`

src/components/askerInfo/AskerInfo.tsx

@@ -1,22 +1,11 @@
 import * as React from 'react';
-import { useCallback, useContext, useEffect, useState } from 'react';
+import { useContext, useEffect } from 'react';
 import { Link, useParams, useHistory } from 'react-router-dom';
-import {
-	SESSION_LIST_TAB,
-	SESSION_LIST_TYPES
-} from '../session/sessionHelpers';
-import {
-	AUTHORITIES,
-	hasUserAuthority,
-	SessionTypeContext,
-	TenantContext,
-	UserDataContext
-} from '../../globalState';
+import { SESSION_LIST_TAB } from '../session/sessionHelpers';
+import { SessionTypeContext } from '../../globalState';
 import { Loading } from '../app/Loading';
-import { AskerInfoData } from './AskerInfoData';
 import { ReactComponent as BackIcon } from '../../resources/img/icons/arrow-left.svg';
 import { ReactComponent as PersonIcon } from '../../resources/img/icons/person.svg';
-import { AskerInfoAssign } from './AskerInfoAssign';
 import '../profile/profile.styles';
 import './askerInfo.styles';
 import { ActiveSessionContext } from '../../globalState/provider/ActiveSessionProvider';
@@ -29,38 +18,29 @@ import {
 	mobileUserProfileView
 } from '../app/navigationHandler';
 import { useTranslation } from 'react-i18next';
-import { AskerInfoTools } from './AskerInfoTools';
-import { Box } from '../box/Box';
 import { RocketChatUsersOfRoomProvider } from '../../globalState/provider/RocketChatUsersOfRoomProvider';
+import { AskerInfoContent } from './AskerInfoContent';
 
 export const AskerInfo = () => {
 	const { t: translate } = useTranslation();
-	const { tenant } = useContext(TenantContext);
 	const { rcGroupId: groupIdFromParam } = useParams<{ rcGroupId: string }>();
 	const history = useHistory();
 
-	const { userData } = useContext(UserDataContext);
-	const { type, path: listPath } = useContext(SessionTypeContext);
+	const { path: listPath } = useContext(SessionTypeContext);
 
 	const { session: activeSession, ready } = useSession(groupIdFromParam);
-	const [isPeerChat, setIsPeerChat] = useState(false);
 
 	const sessionListTab = useSearchParam<SESSION_LIST_TAB>('sessionListTab');
 
 	useEffect(() => {
-		if (!ready) {
+		if (!ready || activeSession) {
 			return;
 		}
 
-		if (!activeSession) {
-			history.push(
-				listPath +
-					(sessionListTab ? `?sessionListTab=${sessionListTab}` : '')
-			);
-			return;
-		}
-
-		setIsPeerChat(activeSession.item.isPeerChat);
+		history.push(
+			listPath +
+				(sessionListTab ? `?sessionListTab=${sessionListTab}` : '')
+		);
 	}, [activeSession, history, listPath, ready, sessionListTab]);
 
 	const { fromL } = useResponsive();
@@ -74,31 +54,6 @@ export const AskerInfo = () => {
 		desktopView();
 	}, [fromL]);
 
-	const isSessionAssignAvailable = useCallback(
-		() =>
-			!hasUserAuthority(AUTHORITIES.ASKER_DEFAULT, userData) &&
-			!activeSession.isLive &&
-			!activeSession.isGroup &&
-			((type === SESSION_LIST_TYPES.ENQUIRY &&
-				hasUserAuthority(
-					AUTHORITIES.ASSIGN_CONSULTANT_TO_ENQUIRY,
-					userData
-				) &&
-				isPeerChat) ||
-				(type !== SESSION_LIST_TYPES.ENQUIRY &&
-					((isPeerChat &&
-						hasUserAuthority(
-							AUTHORITIES.ASSIGN_CONSULTANT_TO_PEER_SESSION,
-							userData
-						)) ||
-						(!isPeerChat &&
-							hasUserAuthority(
-								AUTHORITIES.ASSIGN_CONSULTANT_TO_SESSION,
-								userData
-							))))),
-		[activeSession, isPeerChat, type, userData]
-	);
-
 	if (!activeSession) {
 		return <Loading></Loading>;
 	}
@@ -150,21 +105,7 @@ export const AskerInfo = () => {
 							<h2>{activeSession.user.username}</h2>
 						</div>
 						<div className="askerInfo__content">
-							<Box>
-								<AskerInfoData />
-							</Box>
-							{tenant?.settings?.featureToolsEnabled && (
-								<Box>
-									<AskerInfoTools />
-								</Box>
-							)}
-							{isSessionAssignAvailable() && (
-								<Box>
-									<div className="askerInfo__assign">
-										<AskerInfoAssign />
-									</div>
-								</Box>
-							)}
+							<AskerInfoContent />
 						</div>
 					</div>
 				</div>

src/components/askerInfo/AskerInfoContent.tsx

@@ -0,0 +1,71 @@
+import * as React from 'react';
+import { useCallback, useContext } from 'react';
+import { SESSION_LIST_TYPES } from '../session/sessionHelpers';
+import {
+	AUTHORITIES,
+	hasUserAuthority,
+	SessionTypeContext,
+	TenantContext,
+	UserDataContext
+} from '../../globalState';
+import { AskerInfoData } from './AskerInfoData';
+import { AskerInfoAssign } from './AskerInfoAssign';
+import '../profile/profile.styles';
+import './askerInfo.styles';
+import { ActiveSessionContext } from '../../globalState/provider/ActiveSessionProvider';
+import { AskerInfoTools } from './AskerInfoTools';
+import { Box } from '../box/Box';
+
+export const AskerInfoContent = () => {
+	const { tenant } = useContext(TenantContext);
+	const { activeSession } = useContext(ActiveSessionContext);
+	const { userData } = useContext(UserDataContext);
+
+	const { type } = useContext(SessionTypeContext);
+
+	const isSessionAssignAvailable = useCallback(() => {
+		const isPeerChat = activeSession.item.isPeerChat;
+		return (
+			!hasUserAuthority(AUTHORITIES.ASKER_DEFAULT, userData) &&
+			!activeSession.isLive &&
+			!activeSession.isGroup &&
+			((type === SESSION_LIST_TYPES.ENQUIRY &&
+				hasUserAuthority(
+					AUTHORITIES.ASSIGN_CONSULTANT_TO_ENQUIRY,
+					userData
+				) &&
+				isPeerChat) ||
+				(type !== SESSION_LIST_TYPES.ENQUIRY &&
+					((isPeerChat &&
+						hasUserAuthority(
+							AUTHORITIES.ASSIGN_CONSULTANT_TO_PEER_SESSION,
+							userData
+						)) ||
+						(!isPeerChat &&
+							hasUserAuthority(
+								AUTHORITIES.ASSIGN_CONSULTANT_TO_SESSION,
+								userData
+							)))))
+		);
+	}, [activeSession, type, userData]);
+
+	return (
+		<>
+			<Box>
+				<AskerInfoData />
+			</Box>
+			{tenant?.settings?.featureToolsEnabled && (
+				<Box>
+					<AskerInfoTools />
+				</Box>
+			)}
+			{isSessionAssignAvailable() && (
+				<Box>
+					<div className="askerInfo__assign">
+						<AskerInfoAssign />
+					</div>
+				</Box>
+			)}
+		</>
+	);
+};

src/components/checkbox/Checkbox.tsx

@@ -8,6 +8,7 @@ export interface CheckboxItem {
 	labelId: string;
 	labelClass?: string;
 	label: string;
+	value?: string;
 	description?: string;
 	checked: boolean;
 }
@@ -24,6 +25,7 @@ export const Checkbox = (props) => {
 				className="checkbox__input"
 				type="checkbox"
 				name={checkboxItem.name}
+				value={checkboxItem.value}
 				defaultChecked={checkboxItem.checked}
 			/>
 			{checkboxItem.checked && (

src/components/sessionAssign/RequestSessionAssign.tsx

@@ -212,6 +212,8 @@ export const RequestSessionAssign = (props: { value?: string }) => {
 	return (
 		<div className="assign__wrapper">
 			<SelectDropdown
+				menuShouldBlockScroll
+				menuPosition="fixed"
 				{...prepareSelectDropdown({
 					consultantList,
 					handleDatalistSelect,

src/containers/bookings/components/booking.styles.scss

@@ -25,6 +25,7 @@ $headerHeight: 80px;
 
 	&__header {
 		display: flex;
+		flex: 0;
 		align-items: center;
 		justify-content: space-between;
 		padding: $grid-base-three;
@@ -116,12 +117,17 @@ $headerHeight: 80px;
 		}
 	}
 
+	&__wrapper {
+		display: flex;
+		flex-direction: column;
+	}
+
 	&__innerWrapper {
 		display: flex;
+		flex: 1;
 		flex-direction: column;
 		padding: 0 $grid-base-three;
 		overflow-x: hidden;
-		height: 100%;
 
 		&-event {
 			display: grid;
@@ -217,6 +223,7 @@ $headerHeight: 80px;
 		}
 
 		p {
+			word-break: normal;
 			margin-left: 0.5rem;
 		}
 	}
@@ -372,10 +379,34 @@ $headerHeight: 80px;
 
 	&__video-link-grid {
 		display: none;
-		grid-template-columns: 0.465fr 1fr 0.42fr;
+		grid-template-columns: 0.29fr 1fr 0.42fr;
 		min-height: 32px;
 		align-items: flex-end;
 
+		@media only screen and (min-width: 950px) {
+			grid-template-columns: 0.33fr 1fr 0.42fr;
+		}
+
+		@media only screen and (min-width: 1010px) {
+			grid-template-columns: 0.35fr 1fr 0.42fr;
+		}
+
+		@media only screen and (min-width: 1050px) {
+			grid-template-columns: 0.37fr 1fr 0.42fr;
+		}
+
+		@media only screen and (min-width: 1075px) {
+			grid-template-columns: 0.43fr 1fr 0.42fr;
+		}
+
+		@media only screen and (min-width: 1095px) {
+			grid-template-columns: 0.44fr 1fr 0.42fr;
+		}
+
+		@media only screen and (min-width: 1200px) {
+			grid-template-columns: 0.465fr 1fr 0.42fr;
+		}
+
 		@include breakpoint($fromXXLarge) {
 			grid-template-columns: 0.48fr 1fr 0.405fr;
 		}
@@ -393,6 +424,13 @@ $headerHeight: 80px;
 				overflow: hidden;
 				text-overflow: ellipsis;
 				display: -webkit-box;
+				position: relative;
+				left: 20px;
+
+				@media only screen and (min-width: 1077px) {
+					position: initial;
+					left: 0;
+				}
 			}
 
 			@include breakpoint($fromLarge) {
@@ -401,7 +439,14 @@ $headerHeight: 80px;
 				align-items: center;
 
 				svg {
-					margin-left: 0.75rem;
+					position: relative;
+					right: -50px;
+
+					@media only screen and (min-width: 1077px) {
+						position: initial;
+						right: 0;
+						margin-left: 0.75rem;
+					}
 				}
 			}
 		}

src/resources/scripts/config.ts

@@ -1,6 +1,6 @@
 import deAgency from '../i18n/de/agency.json';
 import deConsultingTypes from '../i18n/de/consultingTypes.json';
-import { AppConfigInterface } from '../../globalState/interfaces/AppConfig/AppConfigInterface';
+import { AppConfigInterface } from '../../globalState';
 import {
 	OVERLAY_RELEASE_NOTE,
 	OVERLAY_TWO_FACTOR_NAG