WIP for #536

Author: oharsta

client/src/components/UserFeedbackWidget.jsx

@@ -27,15 +27,16 @@ export const UserFeedbackWidget = () => {
     };
 
     const captureScreenshot = useCallback(async () => {
+        window.scrollTo({top: 0, behavior: "instant"});
         document.body.classList.add("feedback-capture");
         const canvas = await html2canvas(document.body, {
             backgroundColor: null,
             useCORS: true,
             scale: 1,
-            windowWidth: document.documentElement.clientWidth,
-            windowHeight: document.documentElement.clientHeight
+            windowWidth: document.body.clientWidth,
+            windowHeight: document.body.scrollHeight
         });
-        setTimeout(() => document.body.classList.remove("feedback-capture"), 625);
+        setTimeout(() => document.body.classList.remove("feedback-capture"), 825);
         return canvas.toDataURL("image/png");
     }, []);
 

client/src/hooks/UseLogout.jsx

@@ -11,18 +11,16 @@ export const useLogout = () => {
 
     const logoutUser = useCallback((e, setIsAuthenticated) => {
         stopEvent(e);
+        navigate("/authentication-switch");
         logout().then(() => {
-            useAppStore.setState(() => ({
-                currentOrganization: { name: "" },
-                breadcrumbPaths: [],
-                user: { name: "" }
-            }));
-
             sessionStorage.removeItem(SESSION_STORAGE_LOCATION);
-            navigate("/authentication-switch");
-
+            setIsAuthenticated(false);
             setTimeout(() => {
-                setIsAuthenticated(false);
+                useAppStore.setState(() => ({
+                    currentOrganization: { name: "" },
+                    breadcrumbPaths: [],
+                    user: { name: "" }
+                }));
                 navigate("/home");
             }, 375);
         });

client/src/locale/en.js

@@ -951,17 +951,16 @@ const en = {
     },
     feedback: {
         title: "Provide Feedback",
-        info: "Like what you see? Have a suggestion? Let us know what you think here",
+        info: "Like what you see? Have a suggestion? Let us know what you think here.",
         disclaimer: "We will use this information to fix problems, improve our products and help you. " +
             "We may follow up with you regarding your feedback. " +
-            "Please make sure the feedback does not contain any confidential, sensitive, or personal information. " +
             "For more information, please review our <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://edu.nl/fcgbd\">Privacy Notice</a>.",
         help: "Need help?",
         helpInfo: "For questions or issues, please reach out to us at <a href='mailto:support@surf.nl'>support@surf.nl</a>",
         send: "Provide feedback",
         flash: "Your feedback has been sent. Thanks!",
         widgetLabel: "Feedback",
-        includeScreenshot: "Include screenshot",
+        includeScreenshot: "I agree to have a screenshot of the current page automatically included in the feedback message",
         tooLarge: "The screenshot is too large (max 5MB). It was not attached."
     },
     myOrganization: {

client/src/pages/UserHome.jsx

@@ -1,5 +1,5 @@
 import "./UserHome.scss";
-import React from "react";
+import React, {useEffect} from "react";
 import {useAppStore} from "../stores/AppStore";
 import {Button, ButtonType} from "@surfnet/sds";
 import I18n from "../locale/I18n";
@@ -22,16 +22,20 @@ const UserHome = () => {
     } else if (!isEmpty(user.joinRequests) && isEmpty(currentOrganization?.id)) {
         newLocation = "/relax"
     }
+
+    useEffect(() => {
+        if (newLocation === null) {
+            useAppStore.setState({
+                breadcrumbPaths: [
+                    {path: "/home", value: I18n.t("breadCrumb.home"), menuItemName: mainMenuItems.home}
+                ]
+            });
+        }
+    }, []);
+
     if (newLocation !== null) {
         return <Navigate to={newLocation} replace/>;
-    } else {
-        useAppStore.setState({
-            breadcrumbPaths: [
-                {path: "/home", value: I18n.t("breadCrumb.home"), menuItemName: mainMenuItems.home}
-            ]
-        });
     }
-
     const navigateInner = (menuItem, path) => {
         navigate(path);
         useAppStore.setState(() => ({

server/src/main/java/access/model/DisconnectionRequest.java

@@ -1,14 +1,5 @@
 package access.model;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-@AllArgsConstructor
-@NoArgsConstructor
 public class DisconnectionRequest extends ConnectionRequest {
 
 }