Merge pull request #253 from virtualidentityag/staging

Staging

.github/workflows/build.yml

@@ -70,7 +70,7 @@ jobs:
                   branch: ${{env.BRANCH}}
                   force: true
                   tags: true
-            - uses: actions/upload-artifact@v2
+            - uses: actions/upload-artifact@v4
               if: failure()
               with:
                   name: cypress-videos

.github/workflows/dockerImage.yml

@@ -58,7 +58,7 @@ jobs:
                   echo "127.0.0.1 localhost" | sudo tee -a /etc/hosts
                   echo "fs.inotify.max_user_watches=524288" | sudo tee -a /etc/sysctl.conf
                   npm run test:build
-            - uses: actions/upload-artifact@v2
+            - uses: actions/upload-artifact@v4
               with:
                   name: buildfiles
                   path: build/**/*
@@ -86,7 +86,7 @@ jobs:
         steps:
             - uses: actions/checkout@v4
             - name: Download buildfiles artifact
-              uses: actions/download-artifact@v2
+              uses: actions/download-artifact@v4
               with:
                   name: buildfiles
                   path: build

cypress/e2e/videoconference.cy.ts

@@ -140,7 +140,7 @@ describe('videoconference', () => {
 		it('Start moderator video call', () => {
 			cy.get('@appointmentId').then((id: any) => {
 				const videoUrl = config.urls.consultantVideoConference
-					.replace('/:type', '/app')
+					.replace('/:type', '/overview')
 					.replace('/:appointmentId', `/${id}`);
 
 				cy.visit(videoUrl);
@@ -151,7 +151,7 @@ describe('videoconference', () => {
 
 		it('Start non existent moderator video call', () => {
 			const videoUrl = config.urls.consultantVideoConference
-				.replace('/:type', '/app')
+				.replace('/:type', '/overview')
 				.replace('/:appointmentId', `/${uuid()}`);
 
 			cy.visit(videoUrl);
@@ -248,10 +248,7 @@ describe('videoconference', () => {
 
 				cy.visit(videoUrl);
 
-				cy.url().should(
-					'contain',
-					'/sessions/consultant/sessionPreview'
-				);
+				cy.url().should('contain', '/overview');
 			});
 		});
 
@@ -262,7 +259,7 @@ describe('videoconference', () => {
 
 			cy.visit(videoUrl);
 
-			cy.url().should('contain', '/sessions/consultant/sessionPreview');
+			cy.url().should('contain', '/overview');
 		});
 	});
 

cypress/support/commands/helper/fastLogin.ts

@@ -44,11 +44,13 @@ const fastLoginCommand = (getWillReturn, setWillReturn) =>
 					tomorrow.getTime().toString()
 				);
 
-				cy.visit('/app');
-				cy.wait('@usersData');
 				if (userId === USER_ASKER) {
+					cy.visit('/app');
+					cy.wait('@usersData');
 					cy.wait('@askerSessions');
 				} else {
+					cy.visit('/sessions/consultant/sessionPreview');
+					cy.wait('@usersData');
 					cy.wait('@consultantEnquiriesBase');
 				}
 			});

src/components/app/Routing.tsx

@@ -384,10 +384,9 @@ export const Routing = (props: RoutingProps) => {
 			<Redirect
 				from="*"
 				to={
-					'/sessions/' +
-					(hasUserAuthority(AUTHORITIES.CONSULTANT_DEFAULT, userData)
-						? 'consultant/sessionPreview'
-						: 'user/view')
+					hasUserAuthority(AUTHORITIES.CONSULTANT_DEFAULT, userData)
+						? '/overview'
+						: '/sessions/user/view'
 				}
 			/>
 		</Switch>

src/components/messageSubmitInterface/messageSubmitInterfaceComponent.tsx

@@ -44,6 +44,7 @@ import {
 	convertToRaw,
 	DraftHandleValue,
 	EditorState,
+	getDefaultKeyBinding,
 	RichUtils
 } from 'draft-js';
 import { draftToMarkdown } from 'markdown-draft-js';
@@ -404,17 +405,12 @@ export const MessageSubmitInterfaceComponent = ({
 		]
 	);
 
-	const handleEditorKeyCommand = useCallback(
-		(command) => {
-			const newState = RichUtils.handleKeyCommand(editorState, command);
-			if (newState) {
-				handleEditorChange(newState);
-				return 'handled';
-			}
-			return 'not-handled';
-		},
-		[editorState, handleEditorChange]
-	);
+	const handleCustomKeyBinding = (event) => {
+		if (event.key === 'Enter' && event.shiftKey) {
+			return 'shift-enter';
+		}
+		return getDefaultKeyBinding(event);
+	};
 
 	const resizeTextarea = useCallback(() => {
 		const textInput: any = textareaInputRef.current;
@@ -782,6 +778,23 @@ export const MessageSubmitInterfaceComponent = ({
 		userData
 	]);
 
+	const handleEditorKeyCommand = useCallback(
+		(command) => {
+			const newState = RichUtils.handleKeyCommand(editorState, command);
+			if (command === 'shift-enter') {
+				handleButtonClick();
+				return 'handled';
+			}
+
+			if (newState) {
+				handleEditorChange(newState);
+				return 'handled';
+			}
+			return 'not-handled';
+		},
+		[editorState, handleEditorChange, handleButtonClick]
+	);
+
 	const handleRequestFeedbackCheckbox = useCallback(() => {
 		setRequestFeedbackCheckboxChecked(
 			(requestFeedbackCheckboxChecked) => !requestFeedbackCheckboxChecked
@@ -1026,6 +1039,7 @@ export const MessageSubmitInterfaceComponent = ({
 										handleKeyCommand={
 											handleEditorKeyCommand
 										}
+										keyBindingFn={handleCustomKeyBinding}
 										placeholder={
 											hasRequestFeedbackCheckbox &&
 											requestFeedbackCheckboxChecked

src/components/profile/ConsultantInformation.tsx

@@ -21,6 +21,8 @@ import { EditableData } from '../editableData/EditableData';
 import { apiPatchUserData } from '../../api/apiPatchUserData';
 import { useTranslation } from 'react-i18next';
 import { useAppConfig } from '../../hooks/useAppConfig';
+import { Overlay, OVERLAY_FUNCTIONS, OverlayItem } from '../overlay/Overlay';
+import { ReactComponent as CheckIcon } from '../../resources/img/illustrations/check.svg';
 
 export const ConsultantInformation = () => {
 	const { t: translate } = useTranslation();
@@ -30,6 +32,7 @@ export const ConsultantInformation = () => {
 	const [isSaveDisabled, setIsSaveDisabled] = useState(false);
 	const [editedDisplayName, setEditedDisplayName] = useState('');
 	const [initialDisplayName, setInitialDisplayName] = useState('');
+	const [successOverlayActive, setSuccessOverlayActive] = useState(false);
 
 	const cancelEditButton: ButtonItem = {
 		label: translate('profile.data.edit.button.cancel'),
@@ -42,6 +45,18 @@ export const ConsultantInformation = () => {
 		type: BUTTON_TYPES.LINK
 	};
 
+	const overlayItem: OverlayItem = {
+		svg: CheckIcon,
+		headline: translate('profile.data.displayNameInfo'),
+		buttonSet: [
+			{
+				label: translate('profile.data.displayNameInfoClose'),
+				function: OVERLAY_FUNCTIONS.CLOSE,
+				type: BUTTON_TYPES.AUTO_CLOSE
+			}
+		]
+	};
+
 	const handleValidDisplayName = (displayName) => {
 		setEditedDisplayName(displayName);
 	};
@@ -55,6 +70,7 @@ export const ConsultantInformation = () => {
 			.then(() => {
 				reloadUserData().catch(console.log);
 				setInitialDisplayName(editedDisplayName);
+				setSuccessOverlayActive(true);
 			})
 			.catch((error) => {
 				addNotification({
@@ -71,6 +87,12 @@ export const ConsultantInformation = () => {
 			});
 	};
 
+	const handleSuccessOverlayAction = (buttonFunction: string) => {
+		if (buttonFunction === OVERLAY_FUNCTIONS.CLOSE) {
+			setSuccessOverlayActive(false);
+		}
+	};
+
 	useEffect(() => {
 		if (editedDisplayName) {
 			setIsSaveDisabled(false);
@@ -140,6 +162,12 @@ export const ConsultantInformation = () => {
 					/>
 				</div>
 			)}
+			{successOverlayActive && (
+				<Overlay
+					item={overlayItem}
+					handleOverlay={handleSuccessOverlayAction}
+				/>
+			)}
 		</div>
 	);
 };

src/components/serviceExplanation/ServiceExplanation.styles.scss

@@ -24,5 +24,9 @@ $iconSize: 32px;
 			margin-top: $grid-base;
 			color: $text-low-emphasis;
 		}
+
+		&__customLink {
+			text-decoration: underline;
+		}
 	}
 }

src/components/serviceExplanation/ServiceExplanation.tsx

@@ -50,15 +50,15 @@ export const ServiceExplanation = ({
 				],
 				{ ns: ['consultingTypes', 'common'] }
 			),
-			text: translate(
+			text: `${translate(
 				[
 					`consultingType.${consultingTypeId}.welcomeScreen.anonymous.text`,
 					`consultingType.fallback.welcomeScreen.anonymous.text`,
 					welcomeScreenConfig?.anonymous.text ||
 						'registration.welcomeScreen.info4.text'
 				],
 				{ ns: ['consultingTypes', 'common'] }
-			)
+			)} <a href="${translate('registration.welcomeScreen.info4.link')}" class="serviceExplanation__infoContent__customLink" target="_blank" rel="noreferrer">${translate('registration.welcomeScreen.info4.linkText')}</a>`
 		}
 	];
 

src/components/sessionMenu/SessionMenu.tsx

@@ -14,7 +14,8 @@ import {
 	SessionTypeContext,
 	useConsultingType,
 	UserDataContext,
-	ActiveSessionContext
+	ActiveSessionContext,
+	TenantContext
 } from '../../globalState';
 import {
 	SessionItemInterface,
@@ -69,6 +70,9 @@ import { useTranslation } from 'react-i18next';
 import { LegalLinksContext } from '../../globalState/provider/LegalLinksProvider';
 import { RocketChatUsersOfRoomContext } from '../../globalState/provider/RocketChatUsersOfRoomProvider';
 import LegalLinks from '../legalLinks/LegalLinks';
+import { endpoints } from '../../resources/scripts/endpoints';
+import { refreshKeycloakAccessToken } from '../sessionCookie/refreshKeycloakAccessToken';
+import { apiGetUserDataBySessionId } from '../../api/apiGetUserDataBySessionId';
 
 type TReducedSessionItemInterface = Omit<
 	SessionItemInterface,
@@ -105,6 +109,9 @@ export const SessionMenu = (props: SessionMenuProps) => {
 	const [redirectToSessionsList, setRedirectToSessionsList] = useState(false);
 	const [isRequestInProgress, setIsRequestInProgress] = useState(false);
 
+	const { tenant } = useContext(TenantContext);
+	const [askerItemId, setAskerItemId] = useState<string>();
+
 	const sessionListTab = useSearchParam<SESSION_LIST_TAB>('sessionListTab');
 	const getSessionListTab = () =>
 		`${sessionListTab ? `?sessionListTab=${sessionListTab}` : ''}`;
@@ -327,6 +334,25 @@ export const SessionMenu = (props: SessionMenuProps) => {
 		subRoute: 'userProfile'
 	});
 
+	const openToolsLink = () => {
+		refreshKeycloakAccessToken().then((resp) => {
+			const accessToken = resp.access_token;
+			window.open(
+				`${endpoints.budibaseTools(
+					activeSession.consultant.id
+				)}/consultantview?userId=${askerItemId}&access_token=${accessToken}`,
+				'_blank',
+				'noopener'
+			);
+		});
+	};
+
+	useEffect(() => {
+		apiGetUserDataBySessionId(activeSession.item.id).then((resp) => {
+			setAskerItemId(resp.askerId);
+		});
+	}, [activeSession?.item?.id, askerItemId]); // eslint-disable-line react-hooks/exhaustive-deps
+
 	if (redirectToSessionsList) {
 		mobileListView();
 		return <Redirect to={listPath + getSessionListTab()} />;
@@ -543,6 +569,17 @@ export const SessionMenu = (props: SessionMenuProps) => {
 					</Link>
 				)}
 
+				{!hasUserAuthority(AUTHORITIES.ASKER_DEFAULT, userData) &&
+					tenant?.settings?.featureToolsEnabled &&
+					activeSession?.item.id && (
+						<div
+							className="sessionMenu__item"
+							onClick={() => openToolsLink()}
+						>
+							{translate('chatFlyout.toolsDocumentation')}
+						</div>
+					)}
+
 				{!hasUserAuthority(AUTHORITIES.ASKER_DEFAULT, userData) &&
 					type !== SESSION_LIST_TYPES.ENQUIRY &&
 					activeSession.isSession &&

src/containers/bookings/components/Calcom/Cal.tsx

@@ -53,7 +53,7 @@ export default function Cal({
 			action: 'bookingSuccessful',
 			callback: () => {
 				history.push({
-					pathname: `/sessions/user/view`
+					pathname: `/booking/events/gebuchte`
 				});
 			}
 		});

src/extensions/resources/i18n/overwrites/de/common.json

@@ -130,18 +130,18 @@
 		"overline": "Herzlich willkommen!",
 		"welcomeScreen": {
 			"info1": {
-				"text": "Finden Sie eine passende Beratungsstelle"
+				"text": "Finden Sie eine passende Beratungsstelle."
 			},
 			"info2": {
 				"title": "Nehmen Sie Kontakt auf",
-				"text": "Schreiben Sie eine Nachricht oder vereinbaren Sie einen Termin"
+				"text": "Schreiben Sie eine Nachricht oder vereinbaren Sie einen Termin."
 			},
 			"subline": "So funktioniert die Beratung auf der DigiSucht Plattform:",
 			"info3": {
-				"text": "Je nach Verfügbarkeit per Nachricht, im Textchat, im Videochat oder vor Ort"
+				"text": "Je nach Verfügbarkeit per Nachricht, im Textchat, im Videochat oder vor Ort."
 			},
 			"info4": {
-				"text": "Sie bleiben auf Wunsch anonym und werden kostenfrei beraten"
+				"text": "Sie bleiben auf Wunsch anonym und werden kostenfrei beraten."
 			}
 		},
 		"overlay": {
@@ -198,14 +198,14 @@
 		"username.step.title": "Bitte wählen Sie Ihren Benutzernamen",
 		"welcomeScreen": {
 			"info1": {
-				"text": "Finden Sie eine passende Beratungsstelle"
+				"text": "Finden Sie eine passende Beratungsstelle."
 			},
 			"info2": {
 				"title": "Nehmen Sie Kontakt auf",
-				"text": "Schreiben Sie eine Nachricht oder vereinbaren Sie einen Termin"
+				"text": "Schreiben Sie eine Nachricht oder vereinbaren Sie einen Termin."
 			},
 			"info4": {
-				"text": "Schreiben Sie eine Nachricht oder vereinbaren Sie einen Termin"
+				"text": "Sie bleiben auf Wunsch anonym und werden kostenfrei beraten."
 			}
 		},
 		"overlay": {